Skip to content
Snippets Groups Projects
Commit 27289f15 authored by Brian Major's avatar Brian Major
Browse files

ac2 - user details applied on both user trees

parent 340bcb14
No related branches found
No related tags found
No related merge requests found
...@@ -136,6 +136,11 @@ public class GetUserAction extends AbstractUserAction ...@@ -136,6 +136,11 @@ public class GetUserAction extends AbstractUserAction
try try
{ {
user = userPersistence.getUser(principal); user = userPersistence.getUser(principal);
}
catch (UserNotFoundException e)
{
user = userPersistence.getPendingUser(principal);
}
// Only return user profile info, first and last name. // Only return user profile info, first and last name.
if (detail != null && detail.equalsIgnoreCase("display")) if (detail != null && detail.equalsIgnoreCase("display"))
...@@ -151,11 +156,7 @@ public class GetUserAction extends AbstractUserAction ...@@ -151,11 +156,7 @@ public class GetUserAction extends AbstractUserAction
user.details.clear(); user.details.clear();
user.details.add(new PersonalDetails(pd.getFirstName(), pd.getLastName())); user.details.add(new PersonalDetails(pd.getFirstName(), pd.getLastName()));
} }
}
catch (UserNotFoundException e)
{
user = userPersistence.getPendingUser(principal);
}
} }
return user; return user;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment