From 27289f15a26569d62afc692ef586efc4ffc34771 Mon Sep 17 00:00:00 2001
From: Brian Major <major.brian@gmail.com>
Date: Thu, 3 Sep 2015 12:57:03 -0700
Subject: [PATCH] ac2 - user details applied on both user trees
---
.../ac/server/web/users/GetUserAction.java | 33 ++++++++++---------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
index b03b9a52..ee81cfd6 100644
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
@@ -136,28 +136,29 @@ public class GetUserAction extends AbstractUserAction
try
{
user = userPersistence.getUser(principal);
-
- // Only return user profile info, first and last name.
- if (detail != null && detail.equalsIgnoreCase("display"))
- {
- user.getIdentities().clear();
- Set<PersonalDetails> details = user.getDetails(PersonalDetails.class);
- if (details.isEmpty())
- {
- String error = principal.getName() + " missing required PersonalDetails";
- throw new IllegalStateException(error);
- }
- PersonalDetails pd = details.iterator().next();
- user.details.clear();
- user.details.add(new PersonalDetails(pd.getFirstName(), pd.getLastName()));
- }
}
catch (UserNotFoundException e)
{
user = userPersistence.getPendingUser(principal);
}
+
+ // Only return user profile info, first and last name.
+ if (detail != null && detail.equalsIgnoreCase("display"))
+ {
+ user.getIdentities().clear();
+ Set<PersonalDetails> details = user.getDetails(PersonalDetails.class);
+ if (details.isEmpty())
+ {
+ String error = principal.getName() + " missing required PersonalDetails";
+ throw new IllegalStateException(error);
+ }
+ PersonalDetails pd = details.iterator().next();
+ user.details.clear();
+ user.details.add(new PersonalDetails(pd.getFirstName(), pd.getLastName()));
+ }
+
}
-
+
return user;
}
--
GitLab