[java-identity-provider] branch master updated: Correct degenerate checks for empty criteria/null input.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=a05ff96434b3efe2eef8e396650b6616aad5e694

The following commit(s) were added to refs/heads/master by this push:
       new  a05ff96   Correct degenerate checks for empty criteria/null input.
a05ff96 is described below

commit a05ff96434b3efe2eef8e396650b6616aad5e694
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon May 20 20:01:12 2019 -0400

    Correct degenerate checks for empty criteria/null input.
---
 .../idp/saml/profile/logic/MappedEntityAttributesPredicate.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/logic/MappedEntityAttributesPredicate.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/logic/MappedEntityAttributesPredicate.java
index 0882daf..0b2d2c0 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/logic/MappedEntityAttributesPredicate.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/logic/MappedEntityAttributesPredicate.java
@@ -122,8 +122,10 @@ public class MappedEntityAttributesPredicate extends EntityAttributesPredicate {
     @Override
     public boolean test(@Nullable final EntityDescriptor input) {
         
-        if (input == null || getCandidates().isEmpty()) {
+        if (getCandidates().isEmpty()) {
             return true;
+        } else if (input == null) {
+            return false;
         }
         
         final Collection<Candidate> candidates = new ArrayList<>(getCandidates());

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.