From 20c461803ca45cfd97295c2c8bd384fa020b5f0d Mon Sep 17 00:00:00 2001
From: Alinga Yeung <Alinga.Yeung@nrc-cnrc.gc.ca>
Date: Wed, 19 Aug 2015 17:02:50 -0700
Subject: [PATCH] Story ac2. Added code to check for null subject.
---
.../nrc/cadc/ac/server/web/users/GetUserAction.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 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 dfef465d..feece385 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
@@ -140,12 +140,15 @@ public class GetUserAction extends AbstractUserAction
boolean isServops = false;
AccessControlContext acc = AccessController.getContext();
Subject subject = Subject.getSubject(acc);
- for (Principal principal : subject.getPrincipals())
+ if (subject != null)
{
- if (principal.getName().equals(this.getAugmentUserDN()))
+ for (Principal principal : subject.getPrincipals())
{
- isServops = true;
- break;
+ if (principal.getName().equals(this.getAugmentUserDN()))
+ {
+ isServops = true;
+ break;
+ }
}
}
--
GitLab