Repository: cxf Updated Branches: refs/heads/3.0.x-fixes c033da8ec -> 06e7064de
[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/42e6985b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/42e6985b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/42e6985b Branch: refs/heads/3.0.x-fixes Commit: 42e6985bef61d70032b7fb0d6835107adb4e9e24 Parents: c033da8 Author: Sergey Beryozkin <sberyoz...@talend.com> Authored: Thu Jul 16 17:34:45 2015 +0300 Committer: Sergey Beryozkin <sberyoz...@talend.com> Committed: Thu Jul 16 17:41:44 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/42e6985b/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 5857159..3d0f7e5 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) {
