[java-identity-provider COMMIT] in /trunk: idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.jav...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Mar 29 04:29:17 2013
New Revision: 4370

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4370&view=rev
Log:
Change javadoc for Attribute#getValues() to match code.  Modify ScriptedAttribute to take advantage of same.

Modified:
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttribute.java

Modified: trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java?rev=4370&r1=4369&r2=4370&view=diff
==============================================================================
--- trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java (original)
+++ trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java Fri Mar 29 04:29:17 2013
@@ -155,9 +155,9 @@
     }
 
     /**
-     * Gets the unordered, unmodifiable collection of values of the attribute.
-     * 
-     * @return values of the attribute
+     * Gets the unordered, but guarded, collection of values of the attribute.
+     * 
+     * @return values of the attribute.  
      */
     @Nonnull @NonnullElements public Set<AttributeValue> getValues() {
         return values;

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttribute.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttribute.java?rev=4370&r1=4369&r2=4370&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttribute.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttribute.java Fri Mar 29 04:29:17 2013
@@ -165,11 +165,7 @@
             // We have called getValues - this is what we will keep up to date
             attributeValues.add(what);
         } else {
-            // update the encapsulated attribute
-            Set<AttributeValue> values = new HashSet<AttributeValue>(encapsulatedAttribute.getValues());
-
-            addValue(values, what);
-            encapsulatedAttribute.setValues(values);
+            addValue(encapsulatedAttribute.getValues(), what);
         }
     }