Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CBAC8200B76 for ; Tue, 26 Jul 2016 02:41:08 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CA9DA160A97; Tue, 26 Jul 2016 00:41:08 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1D713160A9A for ; Tue, 26 Jul 2016 02:41:07 +0200 (CEST) Received: (qmail 68140 invoked by uid 500); 26 Jul 2016 00:41:06 -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 67439 invoked by uid 99); 26 Jul 2016 00:41:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Jul 2016 00:41:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 626D9E78B1; Tue, 26 Jul 2016 00:41:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: reta@apache.org To: commits@cxf.apache.org Date: Tue, 26 Jul 2016 00:41:15 -0000 Message-Id: <143225cd7d044ff8b29a32eacfaf530d@git.apache.org> In-Reply-To: <573ae0b605264b058198e87587ce9bb9@git.apache.org> References: <573ae0b605264b058198e87587ce9bb9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/42] cxf git commit: Updating ContainerRequestContextImpl to try and make new security context visible to CXF interceptors too archived-at: Tue, 26 Jul 2016 00:41:09 -0000 Updating ContainerRequestContextImpl to try and make new security context visible to CXF interceptors too Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2ed93ca4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2ed93ca4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2ed93ca4 Branch: refs/heads/master-jaxrs-2.1 Commit: 2ed93ca443d4369203a7b927bfa335a6b4e4b540 Parents: f376b31 Author: Sergey Beryozkin Authored: Tue Jul 19 21:30:38 2016 +0300 Committer: Sergey Beryozkin Committed: Tue Jul 19 21:30:38 2016 +0300 ---------------------------------------------------------------------- .../org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2ed93ca4/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java index 9110e3e..1fa9557 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java @@ -134,6 +134,10 @@ public class ContainerRequestContextImpl extends AbstractRequestContextImpl public void setSecurityContext(SecurityContext sc) { checkContext(); m.put(SecurityContext.class, sc); + if (sc instanceof org.apache.cxf.security.SecurityContext) { + m.put(org.apache.cxf.security.SecurityContext.class, + (org.apache.cxf.security.SecurityContext)sc); + } } private void checkNotPreMatch() {