Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 849272170 -> 5ee12626b
Updating JAXRS SecurityContext to better check for CXF SecurityContext Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5ee12626 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5ee12626 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5ee12626 Branch: refs/heads/2.7.x-fixes Commit: 5ee12626b7a35cbdaeab31f4dc87226e4fcef1dc Parents: 8492721 Author: Sergey Beryozkin <[email protected]> Authored: Thu May 15 14:47:30 2014 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Thu May 15 14:48:28 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/jaxrs/impl/SecurityContextImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/5ee12626/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 2897d73..9c7f24f 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,8 +61,10 @@ public class SecurityContextImpl implements SecurityContext { } public Principal getUserPrincipal() { - org.apache.cxf.security.SecurityContext sc = - m.get(org.apache.cxf.security.SecurityContext.class); + 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 == null ? null : sc.getUserPrincipal(); }
