Repository: tomee Updated Branches: refs/heads/tomee-1.7.x 039495dd3 -> 0f2d8812b
avoid NPE Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0f2d8812 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0f2d8812 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0f2d8812 Branch: refs/heads/tomee-1.7.x Commit: 0f2d8812b55dd1c4acd53e6aa3224107829a2a61 Parents: 039495d Author: Romain Manni-Bucau <[email protected]> Authored: Tue Dec 2 18:39:50 2014 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Tue Dec 2 18:40:13 2014 +0100 ---------------------------------------------------------------------- .../org/apache/openejb/rest/ThreadLocalSecurityContext.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/0f2d8812/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalSecurityContext.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalSecurityContext.java b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalSecurityContext.java index 43022a6..eb22c45 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalSecurityContext.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalSecurityContext.java @@ -54,7 +54,14 @@ public class ThreadLocalSecurityContext extends AbstractRestThreadLocalProxy<Sec } public boolean isUserInRole(final String role) { - return service().isCallerInRole(role) || get().isUserInRole(role); + if (service().isCallerInRole(role)) { + return true; + } + final SecurityContext sc = get(); + if (sc != null) { + return sc.isUserInRole(role); + } + return false; } }
