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 2015/07/16 16:35:02 UTC
cxf git commit: [CXF-6487] Avoiding NPE in the RP service if no
redirect is needed
Repository: cxf
Updated Branches:
refs/heads/master 7a5263686 -> af2c42489
[CXF-6487] Avoiding NPE in the RP service if no redirect is needed
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/af2c4248
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/af2c4248
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/af2c4248
Branch: refs/heads/master
Commit: af2c42489d67a39e5adb3689e92c4d088422f6c5
Parents: 7a52636
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Thu Jul 16 17:34:45 2015 +0300
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Thu Jul 16 17:34:45 2015 +0300
----------------------------------------------------------------------
.../cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/af2c4248/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
index 0bb5239..7c4e66d 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
@@ -61,7 +61,7 @@ public class OidcRpAuthenticationService {
if (location == null && defaultLocation != null) {
String basePath = (String)mc.get("http.base.path");
redirectUri = UriBuilder.fromUri(basePath).path(defaultLocation).build();
- } else {
+ } else if (location != null) {
redirectUri = URI.create(location);
}
if (redirectUri != null) {