[java-shib-common COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt pom.xml src/main/java/edu/internet2/middleware/sh...

[noreply at shibboleth.net]

Author: lajoie
Date: Mon Jul  2 08:33:26 2012
New Revision: 1031

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1031&view=rev
Log:
address regression introduced fixing SC-175 - SC-183

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/pom.xml
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AndMatchFunctorBeanDefinitionParser.java
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/NotMatchFunctorBeanDefinitionParser.java
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/OrMatchFunctorBeanDefinitionParser.java

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/doc/RELEASE-NOTES.txt?rev=1031&r1=1030&r2=1031&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Mon Jul  2 08:33:26 2012
@@ -1,3 +1,7 @@
+Changes in Release 1.3.7
+=============================================
+[SC-183] - Inappropriate 'RuleReference elements within an AND rule are not supported' error
+
 Changes in Release 1.3.6
 =============================================
 [SC-176] - aacli utility doesn't set peer entity role metadata for requester

Modified: branches/REL_1/pom.xml
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/pom.xml?rev=1031&r1=1030&r2=1031&view=diff
==============================================================================
--- branches/REL_1/pom.xml (original)
+++ branches/REL_1/pom.xml Mon Jul  2 08:33:26 2012
@@ -12,7 +12,7 @@
 
     <groupId>edu.internet2.middleware</groupId>
     <artifactId>shibboleth-common</artifactId>
-    <version>1.3.6</version>
+    <version>1.3.7</version>
     <packaging>jar</packaging>
 
     <name>Shibboleth Common Library</name>

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AndMatchFunctorBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AndMatchFunctorBeanDefinitionParser.java?rev=1031&r1=1030&r2=1031&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AndMatchFunctorBeanDefinitionParser.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AndMatchFunctorBeanDefinitionParser.java Mon Jul  2 08:33:26 2012
@@ -55,7 +55,7 @@
         
         ruleElements = XMLHelper.getChildElementsByTagNameNS(configElement,
                 BasicMatchFunctorNamespaceHandler.NAMESPACE, "RuleReference");
-        if(ruleElements != null){
+        if(!ruleElements.isEmpty()){
             throw new BeanCreationException("RuleReference elements within an AND rule are not supported");
         }
     }

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/NotMatchFunctorBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/NotMatchFunctorBeanDefinitionParser.java?rev=1031&r1=1030&r2=1031&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/NotMatchFunctorBeanDefinitionParser.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/NotMatchFunctorBeanDefinitionParser.java Mon Jul  2 08:33:26 2012
@@ -56,8 +56,8 @@
         
         ruleElements = XMLHelper.getChildElementsByTagNameNS(configElement,
                 BasicMatchFunctorNamespaceHandler.NAMESPACE, "RuleReference");
-        if(ruleElements != null){
-            throw new BeanCreationException("RuleReference elements within an AND rule are not supported");
+        if(!ruleElements.isEmpty()){
+            throw new BeanCreationException("RuleReference elements within a NOT rule are not supported");
         }
     }
 }

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/OrMatchFunctorBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/OrMatchFunctorBeanDefinitionParser.java?rev=1031&r1=1030&r2=1031&view=diff
==============================================================================

[... 14 lines stripped ...]