You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/07/07 15:14:04 UTC
cxf git commit: One more completeUri null check
Repository: cxf
Updated Branches:
refs/heads/master c06e570fb -> faa6552c0
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/faa6552c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/faa6552c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/faa6552c
Branch: refs/heads/master
Commit: faa6552c08a6bccde7c739b292b9dec2d1494362
Parents: c06e570
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Thu Jul 7 16:13:47 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Thu Jul 7 16:13:47 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/faa6552c/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 963cd10..c104cf1 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);
}