Repository: tomee Updated Branches: refs/heads/tomee-1.7.x 50c7e4677 -> dddea5c0d
avoid NPE Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/dddea5c0 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/dddea5c0 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/dddea5c0 Branch: refs/heads/tomee-1.7.x Commit: dddea5c0dd2f8bc10347645d139756d4dd265b82 Parents: 50c7e46 Author: Romain Manni-Bucau <[email protected]> Authored: Mon Nov 17 14:59:56 2014 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Mon Nov 17 14:59:56 2014 +0100 ---------------------------------------------------------------------- .../apache/openejb/core/security/AbstractSecurityService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/dddea5c0/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 37b66ff..bebc8d2 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 @@ -259,9 +259,12 @@ public abstract class AbstractSecurityService implements SecurityService<UUID>, @Override public Principal getCallerPrincipal() { final ThreadContext threadContext = ThreadContext.getThreadContext(); + if (threadContext == null) { + return null; + } + final SecurityContext securityContext = threadContext.get(SecurityContext.class); final Set<Principal> principals = securityContext.subject.getPrincipals(); - if (!principals.isEmpty()) { for (final Principal principal : principals) { if (principal.getClass().isAnnotationPresent(CallerPrincipal.class)) {
