Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java

@@ -136,6 +136,11 @@ public class GetUserAction extends AbstractUserAction
             try
             {
                 user = userPersistence.getUser(principal);
+            }
+            catch (UserNotFoundException e)
+            {
+                user = userPersistence.getPendingUser(principal);
+            }
 
             // Only return user profile info, first and last name.
             if (detail != null && detail.equalsIgnoreCase("display"))
@@ -151,11 +156,7 @@ public class GetUserAction extends AbstractUserAction
                 user.details.clear();
                 user.details.add(new PersonalDetails(pd.getFirstName(), pd.getLastName()));
             }
-            }
-            catch (UserNotFoundException e)
-            {
-                user = userPersistence.getPendingUser(principal);
-            }
+
         }
 
     	return user;