From 55e1da0b91b3597e8cf35629ac371b6d4671105c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= Date: Fri, 27 Oct 2006 13:12:40 +0000 Subject: [PATCH] fix for bug #20918 - use embrionic subjobs registration --- org.glite.lb.server/Makefile | 5 ++--- org.glite.lb.server/src/jobstat.c | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index a81a14e..7572307 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -41,9 +41,8 @@ else STATIC_LIB_BK:=libglite_lb_bkserver.a endif -ifdef LB_DAG_EMBRIONIC - LB_DAG_FLAGS:=-DLB_DAG_EMBRIONIC -endif +# Use embrionic DAG registration implicitely +LB_DAG_FLAGS:=-DLB_DAG_EMBRIONIC ifdef LB_BUF LB_BUF_FLAGS:=-DLB_BUF diff --git a/org.glite.lb.server/src/jobstat.c b/org.glite.lb.server/src/jobstat.c index d002abe..1dfec69 100644 --- a/org.glite.lb.server/src/jobstat.c +++ b/org.glite.lb.server/src/jobstat.c @@ -654,7 +654,6 @@ edg_wll_ErrorCode edg_wll_StepIntState(edg_wll_Context ctx, edg_wll_JobStat *stat_out) { intJobStat *ijsp; - int intErr = 0; int flags = 0; int res; int be_strict = 0; @@ -663,11 +662,10 @@ edg_wll_ErrorCode edg_wll_StepIntState(edg_wll_Context ctx, edg_wll_JobStat oldstat; char *oldstat_rgmaline = NULL; + memset(&oldstat,0,sizeof oldstat); - if (seq != 0) { - intErr = edg_wll_LoadIntState(ctx, job, seq - 1, &ijsp); - } - if (seq != 0 && !intErr) { + + if (!edg_wll_LoadIntState(ctx, job, seq - 1, &ijsp)) { edg_wll_CpyStatus(&ijsp->pub,&oldstat); if (ctx->rgma_export) oldstat_rgmaline = write2rgma_statline(&ijsp->pub); -- 1.8.2.3