You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/07/17 17:03:57 UTC

[cxf] 03/05: CXF-7793 - NPE when using authorization grants with setUseJwtFormatForAccessTokens

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 83ea6c42a798719dfd9d7c3a2f671071ce448a07
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jul 17 12:34:09 2018 +0100

    CXF-7793 - NPE when using authorization grants with setUseJwtFormatForAccessTokens
---
 .../apache/cxf/rs/security/oauth2/grants/AbstractGrantHandler.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/AbstractGrantHandler.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/AbstractGrantHandler.java
index 2a8ed10..042232d 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/AbstractGrantHandler.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/AbstractGrantHandler.java
@@ -110,7 +110,7 @@ public abstract class AbstractGrantHandler implements AccessTokenGrantHandler {
                                                     UserSubject subject,
                                                     String requestedGrant,
                                                     List<String> requestedScopes) {
-        return doCreateAccessToken(client, subject, requestedGrant, requestedScopes, null);
+        return doCreateAccessToken(client, subject, requestedGrant, requestedScopes, Collections.emptyList());
     }
 
     protected ServerAccessToken doCreateAccessToken(Client client,
@@ -136,7 +136,7 @@ public abstract class AbstractGrantHandler implements AccessTokenGrantHandler {
     }
 
     protected List<String> getApprovedScopes(Client client, UserSubject subject, List<String> requestedScopes) {
-        // This method can be overridden if the down-scoping is required 
+        // This method can be overridden if the down-scoping is required
         return Collections.emptyList();
     }