[java-opensaml COMMIT] in /trunk/opensaml-core/src/main/java/org/opensaml/core/xml: AbstractXMLObject.java XMLObject....

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Aug 23 23:26:44 2013
New Revision: 3433

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3433&view=rev
Log:
Missed check-in related to previous metadata cred resolver changes.

Modified:
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/XMLObject.java

Modified: trunk/opensaml-core/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java?rev=3433&r1=3432&r2=3433&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java Fri Aug 23 23:26:44 2013
@@ -25,6 +25,7 @@
 import javax.xml.namespace.QName;
 
 import net.shibboleth.utilities.java.support.collection.ClassToInstanceMultiMap;
+import net.shibboleth.utilities.java.support.collection.LockableClassToInstanceMultiMap;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.QNameSupport;
@@ -71,7 +72,7 @@
     private NamespaceManager nsManager;
     
     /** The multimap holding class-indexed instances of additional info associated with this XML object. */
-    private ClassToInstanceMultiMap<Object> objectMetadata;
+    private LockableClassToInstanceMultiMap<Object> objectMetadata;
 
     /**
      * Mapping of ID attributes to XMLObjects in the subtree rooted at this object. This allows constant-time
@@ -94,7 +95,7 @@
         if(namespaceURI != null){
             setElementNamespacePrefix(namespacePrefix);
         }
-        objectMetadata = new ClassToInstanceMultiMap<>(true);
+        objectMetadata = new LockableClassToInstanceMultiMap<>(true);
     }
 
     /** {@inheritDoc} */
@@ -532,7 +533,7 @@
     }
 
     /** {@inheritDoc} */
-    @Nonnull public ClassToInstanceMultiMap<Object> getObjectMetadata() {
+    @Nonnull public LockableClassToInstanceMultiMap<Object> getObjectMetadata() {
         return objectMetadata;
     }
 

Modified: trunk/opensaml-core/src/main/java/org/opensaml/core/xml/XMLObject.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/core/xml/XMLObject.java?rev=3433&r1=3432&r2=3433&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/core/xml/XMLObject.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/core/xml/XMLObject.java Fri Aug 23 23:26:44 2013
@@ -24,7 +24,7 @@
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
-import net.shibboleth.utilities.java.support.collection.ClassToInstanceMultiMap;
+import net.shibboleth.utilities.java.support.collection.LockableClassToInstanceMultiMap;
 
 import org.opensaml.core.xml.schema.XSBooleanValue;
 import org.opensaml.core.xml.util.IDIndex;
@@ -296,6 +296,6 @@
      * 
      * @return the class-to-instance multimap
      */
-    @Nonnull public ClassToInstanceMultiMap<Object> getObjectMetadata();
+    @Nonnull public LockableClassToInstanceMultiMap<Object> getObjectMetadata();
 
 }