diff --git a/src/moab/MJob.c b/src/moab/MJob.c index 3a06979..0c85160 100644 --- a/src/moab/MJob.c +++ b/src/moab/MJob.c @@ -3324,13 +3324,13 @@ int MJobProcessExtensionString( { if ((aindex = MUGetIndex(key,MRMXAttr,TRUE,mxaNONE)) == mxaNONE) { - key = MUStrTok(NULL,";\n",&TokPtr); - if (X.XJobProcessRMXString != (int (*)())0) { (*X.XJobProcessRMXString)(X.xd,J,key); } + key = MUStrTok(NULL,";\n",&TokPtr); + continue; } diff --git a/src/moab/MStats.c b/src/moab/MStats.c index 7b9c5e4..d20e468 100644 --- a/src/moab/MStats.c +++ b/src/moab/MStats.c @@ -898,7 +898,8 @@ int MStatUpdateActiveJobUsage( called from: MQueueAddAJob() */ - if ((J->Req[0]->NAccessPolicy == mnacSingleJob) && + if ((J->Req[0] != NULL) && + (J->Req[0]->NAccessPolicy == mnacSingleJob) && (MSched.NodeAllocMaxPS == TRUE)) { TotalProcs = J->NodesRequested; @@ -922,7 +923,8 @@ int MStatUpdateActiveJobUsage( (double)MSched.Interval / 100.0, (double)MSched.Time - J->StartTime); - if ((J->Req[0]->NAccessPolicy == mnacSingleJob) && + if ((J->Req[0] != NULL) && + (J->Req[0]->NAccessPolicy == mnacSingleJob) && (MSched.NodeAllocMaxPS == TRUE)) { pesdedicated = TotalProcs * interval;