Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 83cc8bf11 -> e711dc72f
One more completeUri null check Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e711dc72 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e711dc72 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e711dc72 Branch: refs/heads/3.1.x-fixes Commit: e711dc72f4f6f4fce383ae9e4782befea4a0273d Parents: 83cc8bf Author: Sergey Beryozkin <[email protected]> Authored: Thu Jul 7 16:13:47 2016 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Thu Jul 7 16:18:05 2016 +0100 ---------------------------------------------------------------------- .../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/e711dc72/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 8bf0111..5f9addd 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 @@ -119,7 +119,7 @@ public class ClientCodeRequestFilter implements ContainerRequestFilter { } protected boolean isStartUriMatched(String absoluteRequestUri) { - return startUri.equals(WILDCARD) && !absoluteRequestUri.endsWith(completeUri) + return startUri.equals(WILDCARD) && (completeUri == null || !absoluteRequestUri.endsWith(completeUri)) || absoluteRequestUri.endsWith(startUri); }
