From 1ccb8ba44e9508d4af817664a303859fd378dc91 Mon Sep 17 00:00:00 2001
From: dev <dev@3f5042e3-fb1d-0410-be18-d6ca2573e517>
Date: Fri, 23 Sep 2005 20:52:23 +0000
Subject: [PATCH] sync

git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@34 3f5042e3-fb1d-0410-be18-d6ca2573e517
---
 include/msched-version.h |  2 +-
 src/moab/MJob.c          | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

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() */