Enduser: prevent NPE when user is not logged in
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/767c3030 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/767c3030 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/767c3030 Branch: refs/heads/2_0_X Commit: 767c303079f7af32fabbc7541a9585495f0295f2 Parents: 521f51a Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Thu Mar 2 11:52:18 2017 +0100 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Thu Mar 2 11:53:58 2017 +0100 ---------------------------------------------------------------------- .../org/apache/syncope/client/enduser/SyncopeEnduserSession.java | 3 +++ .../syncope/client/enduser/resources/UserSelfReadResource.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/767c3030/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java index 7c1af3b..741d40c 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java @@ -138,6 +138,9 @@ public class SyncopeEnduserSession extends WebSession { } public UserTO getSelfTO() { + if (selfTO == null) { + throw new IllegalArgumentException("User not authenticated"); + } return selfTO; } http://git-wip-us.apache.org/repos/asf/syncope/blob/767c3030/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfReadResource.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfReadResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfReadResource.java index a145557..411c720 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfReadResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfReadResource.java @@ -105,7 +105,7 @@ public class UserSelfReadResource extends AbstractBaseResource { }); response.setStatusCode(Response.Status.OK.getStatusCode()); } catch (Exception e) { - LOG.error("Error retrieving selfTO user", e); + LOG.error("Error retrieving selfTO", e); response.setError(Response.Status.BAD_REQUEST.getStatusCode(), new StringBuilder() .append("ErrorMessage{{ ") .append(e.getMessage())
