Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 (1c53e20e) · Commits · OATS-CADC / ac

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

+17 −16

Original line number	Diff line number	Diff line
		@@ -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;