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

[noreply at shibboleth.net]

Author: scantor
Date: Thu May 29 22:23:36 2014
New Revision: 6001

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6001&view=rev
Log:
Add some error checking.

Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterInEntityGroupPolicyRule.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterInEntityGroupPolicyRule.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterInEntityGroupPolicyRule.java?rev=6001&r1=6000&r2=6001&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterInEntityGroupPolicyRule.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterInEntityGroupPolicyRule.java Thu May 29 22:23:36 2014
@@ -26,6 +26,7 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
+import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
 import org.opensaml.saml.saml2.metadata.EntitiesDescriptor;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
@@ -103,7 +104,7 @@
             return Tristate.FAIL;
         }
 
-        EntitiesDescriptor currentGroup = (EntitiesDescriptor) entity.getParent();
+        XMLObject currentGroup = entity.getParent();
         if (currentGroup == null) {
             log.warn("{} Entity descriptor does not have a parent object, unable to check if entity is in group {}",
                     getLogPrefix(), entityGroup);
@@ -111,13 +112,14 @@
         }
 
         do {
-            if (entityGroup.equals(currentGroup.getName())) {
+            if (currentGroup instanceof EntitiesDescriptor && ((EntitiesDescriptor) currentGroup).getName() != null
+                    && entityGroup.equals(((EntitiesDescriptor) currentGroup).getName())) {
                 return Tristate.TRUE;
             }
-            currentGroup = (EntitiesDescriptor) currentGroup.getParent();
+            currentGroup = currentGroup.getParent();
         } while (currentGroup != null);
 
         return Tristate.FALSE;
     }
 
-}
+}