From 3d7b92c3caf3c57db19b5b19f211b76910ee46d8 Mon Sep 17 00:00:00 2001
From: shekhar16 <shekharlaad1609@gmail.com>
Date: Wed, 29 Jan 2025 01:17:32 +0530
Subject: [PATCH] fix(oxtrust-api): save attributes on tr api call

Signed-off-by: shekhar16 shekharlaad1609@gmail.com
---
 .../api/impl/TrustRelationshipWebService.java | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/oxTrust/api-server/src/main/java/org/gluu/oxtrust/api/server/api/impl/TrustRelationshipWebService.java b/oxTrust/api-server/src/main/java/org/gluu/oxtrust/api/server/api/impl/TrustRelationshipWebService.java
index f14cefb4..c33955ff 100644
--- a/oxTrust/api-server/src/main/java/org/gluu/oxtrust/api/server/api/impl/TrustRelationshipWebService.java
+++ b/oxTrust/api-server/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()) {