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 08977200B48 for ; Mon, 18 Jul 2016 13:41:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 06BB9160A6D; Mon, 18 Jul 2016 11:41:14 +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 4F16C160A65 for ; Mon, 18 Jul 2016 13:41:13 +0200 (CEST) Received: (qmail 1120 invoked by uid 500); 18 Jul 2016 11:41:12 -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 1110 invoked by uid 99); 18 Jul 2016 11:41:12 -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; Mon, 18 Jul 2016 11:41:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 697D1DFAF5; Mon, 18 Jul 2016 11:41:12 +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: <1d37c75d73c2438691f4017121f30041@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Fixing OIDC test Date: Mon, 18 Jul 2016 11:41:12 +0000 (UTC) archived-at: Mon, 18 Jul 2016 11:41:14 -0000 Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 997521186 -> fc54df195 Fixing OIDC test Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fc54df19 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fc54df19 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fc54df19 Branch: refs/heads/3.1.x-fixes Commit: fc54df19531b8071c2cc240b40cb1bfd1d28dec1 Parents: 9975211 Author: Sergey Beryozkin Authored: Mon Jul 18 14:39:14 2016 +0300 Committer: Sergey Beryozkin Committed: Mon Jul 18 14:40:57 2016 +0300 ---------------------------------------------------------------------- .../cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/fc54df19/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java index f7acf0a..deefe61 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java @@ -135,7 +135,7 @@ public class ClientCodeRequestFilter implements ContainerRequestFilter { } } // Finally compare start URI with the request URI - return startUri == null || absoluteRequestUri.endsWith(startUri); + return startUri != null && absoluteRequestUri.endsWith(startUri); } private boolean codeResponseQueryParamsAvailable(MultivaluedMap queries) {