[jboss-cvs] JBossAS SVN: r71576 - projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2008-04-01 18:13:45 -0400 (Tue, 01 Apr 2008)
New Revision: 71576

Modified:
   projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Obligation.java
Log:
SECURITY-167: Obligation encode method changes

Modified: projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Obligation.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Obligation.java	2008-04-01 22:13:13 UTC (rev 71575)
+++ projects/security/security-xacml/trunk/jboss-sunxacml/src/main/java/org/jboss/security/xacml/sunxacml/Obligation.java	2008-04-01 22:13:45 UTC (rev 71576)
@@ -48,6 +48,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import org.jboss.security.xacml.sunxacml.attr.AttributeFactory;
 import org.jboss.security.xacml.sunxacml.attr.AttributeValue;
@@ -220,12 +221,28 @@
 
         while (it.hasNext()) {
             Attribute attr = (Attribute)(it.next());
-            out.println(indenter.makeString() +
+            /*out.println(indenter.makeString() +
                         "<AttributeAssignment AttributeId=\"" +
                         attr.getId().toString() + "\" DataType=\"" +
                         attr.getType().toString() + "\">" +
                         attr.getValue().encode() +
-                        "</AttributeAssignment>");
+                        "</AttributeAssignment>");*/
+            
+            StringBuilder str = new StringBuilder();
+            str.append(indenter.makeString());
+            str.append("<AttributeAssignment AttributeId=\"");
+            str.append(attr.getId().toString() + "\" DataType=\"");
+            str.append(attr.getType().toString() + "\">");
+            Set<AttributeValue> attrValues = attr.getValues();
+            if(attrValues != null)
+            {
+               for(AttributeValue val: attrValues)
+               {
+                  str.append(val.encodeWithTags(true));
+               }
+            }
+            str.append("</AttributeAssignment>");
+            out.println(str.toString());
         }
 
         indenter.out();