diff --git a/include/msched-version.h b/include/msched-version.h index 121ce66..23dc6de 100644 --- a/include/msched-version.h +++ b/include/msched-version.h @@ -1 +1 @@ -#define MSCHED_VERSION "maui-3.2.6p14-snap.1129170413" +#define MSCHED_VERSION "maui-3.2.6p14-snap.1129172045" diff --git a/src/moab/MAM.c b/src/moab/MAM.c index 18d51d8..757daff 100644 --- a/src/moab/MAM.c +++ b/src/moab/MAM.c @@ -884,11 +884,11 @@ int MAMAllocRDebit( MXMLAddE(JE,AE); } - if (MSched.Name[0] != '\0') + if (MRM[0].Name[0] != '\0') { AE = NULL; MXMLCreateE(&AE,"MachineName"); - MXMLSetVal(AE,(void *)MSched.Name,mdfString); + MXMLSetVal(AE,(void *)MRM[0].Name,mdfString); MXMLAddE(JE,AE); } diff --git a/src/moab/MPBSI.c b/src/moab/MPBSI.c index cfa3fcb..b45e501 100644 --- a/src/moab/MPBSI.c +++ b/src/moab/MPBSI.c @@ -594,7 +594,7 @@ int MPBSWorkloadQuery( else { DBG(0,fPBS) DPrint("ALERT: queue is empty or cannot get PBS job info: %s\n", - ErrMsg); + (ErrMsg != NULL) ? ErrMsg : "N/A"); R->U.PBS.ServerSDTimeStamp = 0;