Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 928A911278 for ; Fri, 16 May 2014 22:38:58 +0000 (UTC) Received: (qmail 92749 invoked by uid 500); 16 May 2014 11:21:49 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 33087 invoked by uid 500); 16 May 2014 11:08:48 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 6017 invoked by uid 99); 16 May 2014 11:01:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 May 2014 11:01:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4E94C92D004; Fri, 16 May 2014 09:05:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <170565e5f39e4062ba2176ce19705bd6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Another minor update to JAXRS SecurityContextImpl Date: Fri, 16 May 2014 09:05:55 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 85d44cf51 -> a91805329 Another minor update to JAXRS SecurityContextImpl Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a9180532 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a9180532 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a9180532 Branch: refs/heads/master Commit: a91805329fc5de8bc194a86f24c70d93f4349084 Parents: 85d44cf Author: Sergey Beryozkin Authored: Fri May 16 10:05:32 2014 +0100 Committer: Sergey Beryozkin Committed: Fri May 16 10:05:32 2014 +0100 ---------------------------------------------------------------------- .../apache/cxf/jaxrs/impl/SecurityContextImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a9180532/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/SecurityContextImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/SecurityContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/SecurityContextImpl.java index 9c7f24f..5127d7b 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/SecurityContextImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/SecurityContextImpl.java @@ -61,10 +61,7 @@ public class SecurityContextImpl implements SecurityContext { } public Principal getUserPrincipal() { - org.apache.cxf.security.SecurityContext sc = m.getContent(org.apache.cxf.security.SecurityContext.class); - if (sc == null) { - sc = m.get(org.apache.cxf.security.SecurityContext.class); - } + org.apache.cxf.security.SecurityContext sc = getInternalSecurityContext(); return sc == null ? null : sc.getUserPrincipal(); } @@ -75,9 +72,15 @@ public class SecurityContextImpl implements SecurityContext { } public boolean isUserInRole(String role) { - org.apache.cxf.security.SecurityContext sc = - m.get(org.apache.cxf.security.SecurityContext.class); + org.apache.cxf.security.SecurityContext sc = getInternalSecurityContext(); return sc == null ? false : sc.isUserInRole(role); } + private org.apache.cxf.security.SecurityContext getInternalSecurityContext() { + org.apache.cxf.security.SecurityContext sc = m.getContent(org.apache.cxf.security.SecurityContext.class); + if (sc == null) { + sc = m.get(org.apache.cxf.security.SecurityContext.class); + } + return sc; + } }