Merge pull request #98 from GluuFederation/issue_82

fix(oxtrust-api): save attributes on tr api call
GluuFederation · Jan 28, 2025 · 1ed2626 · 1ed2626
2 parents 595eb49 + 3d7b92c
commit 1ed2626
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/...erver/src/main/java/org/gluu/oxtrust/api/server/api/impl/TrustRelationshipWebService.java b/...erver/src/main/java/org/gluu/oxtrust/api/server/api/impl/TrustRelationshipWebService.java
@@ -979,16 +979,18 @@ private static List<SAMLTrustRelationshipShort> convertTRtoTRShort (List<GluuSAM
 
     private String updateReleasedAttributes(GluuSAMLTrustRelationship trustRelationship)  {
         List<String> releasedAttributes = new ArrayList<String>();
-        for (String attribute : trustRelationship.getReleasedAttributes()) {
-            GluuAttribute gluuAttribute  = null;
-            try {
-                gluuAttribute = attributeService.getAttributeByDn(attribute);
-            } catch (Exception e) {
-                logger.debug("Invalid Attribute Dn : {} ",attribute);
-                return "Trust Relationship Operation failed due to invalid attribute : "+ attribute;
+        if((trustRelationship.getReleasedAttributes() != null) && !trustRelationship.getReleasedAttributes().isEmpty()) {
+            for (String attribute : trustRelationship.getReleasedAttributes()) {
+                GluuAttribute gluuAttribute = null;
+                try {
+                    gluuAttribute = attributeService.getAttributeByDn(attribute);
+                } catch (Exception e) {
+                    logger.debug("Invalid Attribute Dn : {} ", attribute);
+                    return "Trust Relationship Operation failed due to invalid attribute : " + attribute;
+                }
+                if (gluuAttribute != null)
+                    releasedAttributes.add(attribute);
             }
-            if(gluuAttribute != null)
-                releasedAttributes.add(attribute);
         }
 
         if (!releasedAttributes.isEmpty()) {