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/09/05 16:23:03 UTC

[cxf-fediz] 02/02: Fixing backmerge

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

coheigea pushed a commit to branch 1.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git

commit aeefdcbebe6e17ab50b07ca0bb32f0edb4f0cb99
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Sep 5 17:22:49 2018 +0100

    Fixing backmerge
---
 .../apache/cxf/fediz/service/idp/protocols/RoleClaimsHandler.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/RoleClaimsHandler.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/RoleClaimsHandler.java
index 8551203..f7cad8d 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/RoleClaimsHandler.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/RoleClaimsHandler.java
@@ -20,7 +20,9 @@
 package org.apache.cxf.fediz.service.idp.protocols;
 
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 import org.apache.cxf.jaxrs.json.basic.JsonMapObject;
 import org.apache.wss4j.common.saml.bean.AttributeBean;
@@ -44,7 +46,9 @@ public class RoleClaimsHandler implements ClaimsHandler {
                 AttributeBean attributeBean = new AttributeBean();
                 attributeBean.setQualifiedName(ROLE.toString());
                 attributeBean.setNameFormat(nameFormat);
-                attributeBean.setAttributeValues(Collections.singletonList(role));
+                List<Object> attributes = new ArrayList<>();
+                attributes.add(role);
+                attributeBean.setAttributeValues(attributes);
                 attrBean.setSamlAttributes(Collections.singletonList(attributeBean));
                 return attrBean;
             }