diff --git a/include/msched-version.h b/include/msched-version.h index ba0d247..82352a1 100644 --- a/include/msched-version.h +++ b/include/msched-version.h @@ -1 +1 @@ -#define MSCHED_VERSION "maui-3.2.6p14-snap.1126543721" +#define MSCHED_VERSION "maui-3.2.6p14-snap.1127489156" diff --git a/src/moab/MJob.c b/src/moab/MJob.c index 14e7eb1..b8cf420 100644 --- a/src/moab/MJob.c +++ b/src/moab/MJob.c @@ -469,14 +469,6 @@ int MJobGetAccount( return(SUCCESS); } - if ((MSched.DefaultU != NULL) && - (MSched.DefaultU->F.ADef != NULL)) - { - *A = MSched.DefaultU->F.ADef; - - return(SUCCESS); - } - if ((J->Cred.G != NULL) && (J->Cred.G->F.ADef != NULL)) { @@ -513,6 +505,22 @@ int MJobGetAccount( return(FAILURE); } } /* END if (MAM[0].Type != mamtNONE) */ + + if ((MSched.DefaultU != NULL) && + (MSched.DefaultU->F.ADef != NULL)) + { + *A = MSched.DefaultU->F.ADef; + + return(SUCCESS); + } + + if ((MSched.DefaultG != NULL) && + (MSched.DefaultG->F.ADef != NULL)) + { + *A = MSched.DefaultG->F.ADef; + + return(SUCCESS); + } return(SUCCESS); } /* END MJobGetAccount() */