Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.x 3f1f037e5 -> 07201a542


avoid NPE


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/07201a54
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/07201a54
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/07201a54

Branch: refs/heads/tomee-1.7.x
Commit: 07201a54286e07367699a516cb4bb60e60502974
Parents: 3f1f037
Author: Romain Manni-Bucau <[email protected]>
Authored: Wed Dec 3 16:01:18 2014 +0100
Committer: Romain Manni-Bucau <[email protected]>
Committed: Wed Dec 3 16:01:18 2014 +0100

----------------------------------------------------------------------
 .../apache/openejb/core/security/AbstractSecurityService.java    | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/07201a54/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
----------------------------------------------------------------------
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
index bebc8d2..3fcaf18 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
@@ -239,6 +239,10 @@ public abstract class AbstractSecurityService implements 
SecurityService<UUID>,
         }
 
         final ThreadContext threadContext = ThreadContext.getThreadContext();
+        if (threadContext == null) {
+            return false;
+        }
+
         final SecurityContext securityContext = 
threadContext.get(SecurityContext.class);
 
         final Set<Group> grps = 
securityContext.subject.getPrincipals(Group.class);

Reply via email to