[java-identity-provider COMMIT] in /trunk: idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthnCo...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Nov  5 16:25:05 2015
New Revision: 7951

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

Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthnContextDeclPrincipal.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/NameIDPrincipal.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/NameIdentifierPrincipal.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddAuthnStatementToAssertionFromInboundAssertionToken.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddDelegationRestrictionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/AddLogoutRequest.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthnContextDeclPrincipal.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthnContextDeclPrincipal.java?rev=7951&r1=7950&r2=7951&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthnContextDeclPrincipal.java	(original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthnContextDeclPrincipal.java	Thu Nov  5 16:25:05 2015
@@ -23,6 +23,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.saml2.core.AuthnContextDecl;
 
 import net.shibboleth.idp.authn.principal.CloneablePrincipal;
@@ -102,7 +103,8 @@
     public AuthnContextDeclPrincipal clone() throws CloneNotSupportedException {
         AuthnContextDeclPrincipal copy = (AuthnContextDeclPrincipal) super.clone();
         try {
-            copy.authnContextDecl = XMLObjectSupport.cloneXMLObject(authnContextDecl, true);
+            copy.authnContextDecl = XMLObjectSupport.cloneXMLObject(authnContextDecl, 
+                    CloneOutputOption.RootDOMInNewDocument);
             copy.name = SerializeSupport.nodeToString(
                     Constraint.isNotNull(XMLObjectSupport.getMarshaller(copy.authnContextDecl),
                             "No marshaller for AuthnContextDecl").marshall(copy.authnContextDecl));

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/NameIDPrincipal.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/NameIDPrincipal.java?rev=7951&r1=7950&r2=7951&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/NameIDPrincipal.java	(original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/NameIDPrincipal.java	Thu Nov  5 16:25:05 2015
@@ -28,6 +28,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.saml2.core.NameID;
 
 /**
@@ -95,7 +96,7 @@
     public NameIDPrincipal clone() throws CloneNotSupportedException {
         NameIDPrincipal copy = (NameIDPrincipal) super.clone();
         try {
-            copy.nameID = XMLObjectSupport.cloneXMLObject(nameID, true);
+            copy.nameID = XMLObjectSupport.cloneXMLObject(nameID, CloneOutputOption.RootDOMInNewDocument);
             copy.name = SerializeSupport.nodeToString(
                     Constraint.isNotNull(XMLObjectSupport.getMarshaller(copy.nameID),
                             "No marshaller for nameID").marshall(copy.nameID));

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/NameIdentifierPrincipal.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/NameIdentifierPrincipal.java?rev=7951&r1=7950&r2=7951&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/NameIdentifierPrincipal.java	(original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/NameIdentifierPrincipal.java	Thu Nov  5 16:25:05 2015
@@ -28,6 +28,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.saml1.core.NameIdentifier;
 
 /**
@@ -95,7 +96,8 @@

[... 59 lines stripped ...]