cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [15/33] cxf git commit: One more completeUri null check
Date Mon, 11 Jul 2016 00:14:20 GMT
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-jaxrs-2.1
Commit: faa6552c08a6bccde7c739b292b9dec2d1494362
Parents: c06e570
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Thu Jul 7 16:13:47 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@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);
     }
 


Mime
View raw message