[cxf] 01/03: Fixed potential NPE in SAML OAuth 2.0 code

[coheigea]

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 dd2ad753ca0980a3f83347016adff97aee5c09c2
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Fri Jul 20 12:30:21 2018 +0100

    Fixed potential NPE in SAML OAuth 2.0 code
---
 .../cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
 
b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
index c989109..36e9e68 100644
--- 
a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
+++ 
b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
@@ -138,7 +138,7 @@ public class Saml2BearerGrantHandler extends 
AbstractGrantHandler {
             SAMLSecurityContext jaxrsSc = (SAMLSecurityContext)sc;
             Set<Principal> rolesP = jaxrsSc.getUserRoles();
             List<String> roles = new ArrayList<>();
-            if (roles != null) {
+            if (rolesP != null) {
                 for (Principal p : rolesP) {
                     roles.add(p.getName());
                 }