cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: NPE fix
Date Thu, 21 Apr 2016 16:04:53 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 8269b3c46 -> c9e1cb723


NPE fix


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c9e1cb72
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c9e1cb72
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c9e1cb72

Branch: refs/heads/master
Commit: c9e1cb7239b875c08697b894ca9d42c14d6dbfec
Parents: 8269b3c
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Apr 21 17:04:44 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Apr 21 17:04:44 2016 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/rs/security/oidc/idp/OidcHybridService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/c9e1cb72/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcHybridService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcHybridService.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcHybridService.java
index 22a4a69..edade5b 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcHybridService.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcHybridService.java
@@ -74,7 +74,7 @@ public class OidcHybridService extends OidcImplicitService {
         StringBuilder sb = super.prepareGrant(state, client, requestedScope, 
                                                           approvedScope, userSubject, preAuthorizedToken);
    
-        if (state.getResponseType().startsWith(OAuthConstants.CODE_RESPONSE_TYPE)) {
+        if (state.getResponseType() != null && state.getResponseType().startsWith(OAuthConstants.CODE_RESPONSE_TYPE))
{
             String code = codeService.getGrantCode(state, client, requestedScope,
                                                    approvedScope, userSubject, preAuthorizedToken);
             


Mime
View raw message