[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAML...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Nov  5 16:24:41 2015
New Revision: 4389

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4389&view=rev
Log:
Update XMLObject cloning usage related to OSJ-139.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntry.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntry.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntry.java?rev=4389&r1=4388&r2=4389&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntry.java	(original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntry.java	Thu Nov  5 16:24:41 2015
@@ -24,6 +24,7 @@
 import org.opensaml.core.xml.io.MarshallingException;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.core.xml.util.XMLObjectSupport;
+import org.opensaml.core.xml.util.XMLObjectSupport.CloneOutputOption;
 import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.binding.artifact.SAMLArtifactMap.SAMLArtifactMapEntry;
 
@@ -61,7 +62,7 @@
         if (!samlMessage.hasParent()) {
             message = samlMessage;
         } else {
-            message = XMLObjectSupport.cloneXMLObject(samlMessage, true);
+            message = XMLObjectSupport.cloneXMLObject(samlMessage, CloneOutputOption.RootDOMInNewDocument);
         }
     }
 

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java?rev=4389&r1=4388&r2=4389&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java	Thu Nov  5 16:24:41 2015
@@ -140,9 +140,6 @@
                         log.info("Adding EntityAttribute ({}) to EntityDescriptor ({})", attribute.getName(),
                                 descriptor.getEntityID());
                         final Attribute copy = XMLObjectSupport.cloneXMLObject(attribute);
-                        // Drop the cloned DOM in case the lack of a parent node matters.
-                        copy.releaseDOM();
-                        copy.releaseChildrenDOM(true);
                         entityAttributes.getAttributes().add(copy);
                     } catch (final MarshallingException | UnmarshallingException e) {
                         log.error("Error cloning Attribute", e);