[java-identity-provider COMMIT] /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/i...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Jun 17 19:43:31 2015
New Revision: 7571

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7571&view=rev
Log:
Use SAML2ActionSupport method to test/add Conditions to Assertion.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java?rev=7571&r1=7570&r2=7571&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java	Wed Jun 17 19:43:31 2015
@@ -73,6 +73,7 @@
 import org.opensaml.saml.saml2.metadata.AttributeConsumingService;
 import org.opensaml.saml.saml2.metadata.RequestedAttribute;
 import org.opensaml.saml.saml2.metadata.RoleDescriptor;
+import org.opensaml.saml.saml2.profile.SAML2ActionSupport;
 import org.opensaml.security.SecurityException;
 import org.opensaml.security.credential.Credential;
 import org.opensaml.security.credential.CredentialResolver;
@@ -516,11 +517,8 @@
     private void addIdPAudienceRestriction(@Nonnull final ProfileRequestContext requestContext, 
             @Nonnull final Assertion assertion) {
         
-        Conditions conditions = assertion.getConditions();
-        if (conditions == null) {
-            conditions = (Conditions) XMLObjectSupport.buildXMLObject(Conditions.DEFAULT_ELEMENT_NAME);
-            assertion.setConditions(conditions);
-        }
+        SAML2ActionSupport.addConditionsToAssertion(this, assertion);
+        
         List<AudienceRestriction> audienceRestrictions = assertion.getConditions().getAudienceRestrictions();
         AudienceRestriction audienceRestriction = null;
         if (audienceRestrictions.isEmpty()) {