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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Jul 16 09:11:18 2013
New Revision: 4574

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4574&view=rev
Log:
Tidy

Modified:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AndTest.java

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java?rev=4574&r1=4573&r2=4574&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java Tue Jul 16 09:11:18 2013
@@ -159,16 +159,6 @@
             elem = ElementSupport.getElementAncestor(elem);
         } while (elem != null);
         log.warn("Element '{}' : could not find schema defined parent");
-        elem = element;
-        do {
-            if (ElementSupport.isElementNamed(element, AttributeFilterPolicyParser.POLICY_REQUIREMENT_RULE)) {
-                return true;
-            } else if (ElementSupport.isElementNamed(element, AttributeRuleParser.DENY_VALUE_RULE) ||
-                       ElementSupport.isElementNamed(element, AttributeRuleParser.PERMIT_VALUE_RULE)) {
-                return false;
-            }
-            elem = ElementSupport.getElementAncestor(elem);
-        } while (elem != null);
         return false;
     }
 }

Modified: trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AndTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AndTest.java?rev=4574&r1=4573&r2=4574&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AndTest.java (original)
+++ trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AndTest.java Tue Jul 16 09:11:18 2013
@@ -23,10 +23,8 @@
 import net.shibboleth.idp.attribute.filter.PolicyRequirementRule;
 import net.shibboleth.idp.attribute.filter.impl.matcher.logic.AndMatcher;
 import net.shibboleth.idp.attribute.filter.impl.matcher.logic.NotMatcher;
-import net.shibboleth.idp.attribute.filter.impl.matcher.logic.OrMatcher;
 import net.shibboleth.idp.attribute.filter.impl.policyrule.logic.AndPolicyRule;
 import net.shibboleth.idp.attribute.filter.impl.policyrule.logic.NotPolicyRule;
-import net.shibboleth.idp.attribute.filter.impl.policyrule.logic.OrPolicyRule;
 import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
 
 import org.testng.Assert;