[java-identity-provider COMMIT] /trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Jun 25 11:40:55 2014
New Revision: 6171

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6171&view=rev
Log:
IDP-376 Fix parsing bug.  Its the type of the rule which distinguished whether we are looking at EntityAttributes or RequestedAttributes.

Modified:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java?rev=6171&r1=6170&r2=6171&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java Wed Jun 25 11:40:55 2014
@@ -25,7 +25,7 @@
 import net.shibboleth.idp.attribute.filter.spring.matcher.BaseAttributeValueMatcherParser;
 import net.shibboleth.idp.saml.profile.config.navigate.AttributeConsumerServiceLookupFunction;
 import net.shibboleth.idp.saml.profile.config.navigate.EntityDescriptorLookupFunction;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
+import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
 
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
 import org.opensaml.saml.common.messaging.context.AttributeConsumingServiceContext;
@@ -68,7 +68,7 @@
                     config.getAttributeNodeNS(null, "matchIfMetadataSilent"));
         }
 
-        if (ElementSupport.isElementNamed(config, ENTITY_ATTRIBUTE_IN_METADATA)) {
+        if (ENTITY_ATTRIBUTE_IN_METADATA.equals(DOMTypeSupport.getXSIType(config))) {
             builder.addPropertyValue("objectStrategy", new EntityDescriptorLookupFunction());
         } else {
             builder.addPropertyValue("objectStrategy", Functions.compose(new AttributeConsumerServiceLookupFunction(),