[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: scantor
Date: Wed Sep  7 20:54:52 2011
New Revision: 1005

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1005&view=rev
Log:
SC-163: Check for no Extensions element

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/pom.xml
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AbstractEntityAttributeMatchFunctor.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=1005&r1=1004&r2=1005&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Wed Sep  7 20:54:52 2011
@@ -1,3 +1,7 @@
+Changes in Release 1.3.4
+=============================================
+[SC-163] - NPE when using filtering based on EntityAttributes in metadata
+
 Changes in Release 1.3.3
 =============================================
 [SIDP-161] - Filter engine removes "duplicate" scoped values based soley on the value and ignores the scope

Modified: branches/REL_1/pom.xml
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/pom.xml?rev=1005&r1=1004&r2=1005&view=diff
==============================================================================
--- branches/REL_1/pom.xml (original)
+++ branches/REL_1/pom.xml Wed Sep  7 20:54:52 2011
@@ -12,7 +12,7 @@
 
     <groupId>edu.internet2.middleware</groupId>
     <artifactId>shibboleth-common</artifactId>
-    <version>1.3.3</version>
+    <version>1.3.4</version>
     <packaging>jar</packaging>
 
     <name>Shibboleth Common Library</name>

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AbstractEntityAttributeMatchFunctor.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AbstractEntityAttributeMatchFunctor.java?rev=1005&r1=1004&r2=1005&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AbstractEntityAttributeMatchFunctor.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AbstractEntityAttributeMatchFunctor.java Wed Sep  7 20:54:52 2011
@@ -166,8 +166,11 @@
      * @return the entity or null if the metadata does not contain such an entity attribute
      */
     protected Attribute getEntityAttribute(EntityDescriptor entityDescriptor) {
-        List<XMLObject> entityAttributesCollection = entityDescriptor.getExtensions().getUnknownXMLObjects(
-                EntityAttributes.DEFAULT_ELEMENT_NAME);
+        List<XMLObject> entityAttributesCollection = null;
+        if (entityDescriptor.getExtensions() != null) {
+            entityAttributesCollection = entityDescriptor.getExtensions().getUnknownXMLObjects(
+                    EntityAttributes.DEFAULT_ELEMENT_NAME);
+        }
         if (entityAttributesCollection == null || entityAttributesCollection.isEmpty()) {
             log.debug("Descriptor for {} does not contain any EntityAttributes", entityDescriptor.getEntityID());
             return null;