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 A168518A6D for ; Wed, 17 Feb 2016 16:37:34 +0000 (UTC) Received: (qmail 54688 invoked by uid 500); 17 Feb 2016 16:37:34 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 54627 invoked by uid 500); 17 Feb 2016 16:37:34 -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 54618 invoked by uid 99); 17 Feb 2016 16:37:34 -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; Wed, 17 Feb 2016 16:37:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 27A4EDFA43; Wed, 17 Feb 2016 16:37:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Wed, 17 Feb 2016 16:37:35 -0000 Message-Id: <886a11e5800247c2b9e0e93f5469d0f8@git.apache.org> In-Reply-To: <133d2661717a4c4b8d39e96faf9038be@git.apache.org> References: <133d2661717a4c4b8d39e96faf9038be@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cxf git commit: Store previous params in the new map, allow them to be overwritten by request params Store previous params in the new map, allow them to be overwritten by request params Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/58f1631f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/58f1631f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/58f1631f Branch: refs/heads/3.1.x-fixes Commit: 58f1631ff7bbcd72815e7b276648a10fdc16ef1d Parents: 43fafd0 Author: Colm O hEigeartaigh Authored: Wed Feb 17 16:19:23 2016 +0000 Committer: Colm O hEigeartaigh Committed: Wed Feb 17 16:32:43 2016 +0000 ---------------------------------------------------------------------- .../cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/58f1631f/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java index e05404d..1a82470 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java @@ -83,7 +83,7 @@ public class JwtRequestCodeFilter extends OAuthJoseJwtConsumer implements Author throw new SecurityException(); } - MultivaluedMap newParams = new MetadataMap(); + MultivaluedMap newParams = new MetadataMap(params); Map claimsMap = claims.asMap(); for (Map.Entry entry : claimsMap.entrySet()) { String key = entry.getKey();