[java-identity-provider COMMIT] in /trunk/idp-consent-impl/src: main/java/net/shibboleth/idp/consent/logic/impl/Attri...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Sep  7 13:25:25 2016
New Revision: 8377

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8377&view=rev
Log:
Fix NPE when input to predicate is null

Modified:
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributePredicate.java
    trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributePredicateTest.java

Modified: trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributePredicate.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributePredicate.java?rev=8377&r1=8376&r2=8377&view=diff
==============================================================================
--- trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributePredicate.java	(original)
+++ trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/logic/impl/AttributePredicate.java	Wed Sep  7 13:25:25 2016
@@ -91,6 +91,10 @@
     @Override
     public boolean apply(@Nullable final IdPAttribute input) {
 
+        if (input == null) {
+            return false;
+        }
+
         final String attributeId = input.getId();
 
         if (!whitelistedAttributeIds.isEmpty() && !whitelistedAttributeIds.contains(attributeId)) {

Modified: trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributePredicateTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributePredicateTest.java?rev=8377&r1=8376&r2=8377&view=diff
==============================================================================
--- trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributePredicateTest.java	(original)
+++ trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/logic/impl/AttributePredicateTest.java	Wed Sep  7 13:25:25 2016
@@ -117,4 +117,9 @@
         Assert.assertFalse(p.apply(attribute1));
         Assert.assertTrue(p.apply(attribute2));
     }
+
+    @Test public void testNullInput() {
+        p = new AttributePredicate();
+        Assert.assertFalse(p.apply(null));
+    }
 }