- internal consistency assertion (FetchRow)

- fix missing field in unit test data

diff --git a/org.glite.lb.server/src/get_events.c.T b/org.glite.lb.server/src/get_events.c.T
index 4e0bfbe..5f05332 100644 (file)
--- a/org.glite.lb.server/src/get_events.c.T
+++ b/org.glite.lb.server/src/get_events.c.T
@@ -44,6 +44,7 @@ int edg_wll_get_event_flesh(edg_wll_Context ctx,int n,edg_wll_Event *e)
                if ((ret=edg_wll_ExecSQL(ctx,q,&sh)) < 0) goto cleanup;
 
                while ((ret=edg_wll_FetchRow(ctx,sh,sizeof(nameval)/sizeof(nameval[0]),NULL,nameval)) > 0) {
+                       assert(ret == 2);
                        edg_wll_set_event_field(e,nameval[0],nameval[1]);
                        free(nameval[0]);
                        /* XXX: nameval[1] freed in edg_wll_set_event_field

diff --git a/org.glite.lb.server/test/oneJob.qry b/org.glite.lb.server/test/oneJob.qry
index 74655ff..fd5e8bf 100644 (file)
--- a/org.glite.lb.server/test/oneJob.qry
+++ b/org.glite.lb.server/test/oneJob.qry
@@ -19,6 +19,6 @@ FROM_HOST     sending component hostname
 FROM_INSTANCE  sending component instance
 LOCAL_JOBID    new jobId (Condor  Globus ...)
 SEQCODE        UI=000002:NS=0000000001:WM=000000:BH=0000000000:JSS=000000:LM=000000:LRMS=000000:APP=000000:LBS=000000
-SRC_INSTANCE   
+SRC_INSTANCE   (nil)
 
 select name,value from long_fields where jobid = 'WrCEKje9QTXFiSOZuPMLtw' and event = 1