[java-opensaml] branch master updated: OSJ-247 - Preserve affiliation descriptors in entity metadata

[Scott Cantor]

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

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

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=30a7a466764802431dc949047696154583b5367c

The following commit(s) were added to refs/heads/master by this push:
       new  30a7a46   OSJ-247 - Preserve affiliation descriptors in entity metadata
30a7a46 is described below

commit 30a7a466764802431dc949047696154583b5367c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Aug 30 11:08:04 2018 -0400

    OSJ-247 - Preserve affiliation descriptors in entity metadata
    
    https://issues.shibboleth.net/jira/browse/OSJ-247
---
 .../opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilter.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilter.java
index 72d6da3..177fe7b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilter.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilter.java
@@ -174,10 +174,10 @@ public class EntityRoleFilter implements MetadataFilter {
             while (entityDescriptorsItr.hasNext()) {
                 entityDescriptor = entityDescriptorsItr.next();
                 filterEntityDescriptor(entityDescriptor);
-                if (getRemoveRolelessEntityDescriptors()) {
+                if (getRemoveRolelessEntityDescriptors() && entityDescriptor.getAffiliationDescriptor() == null) {
                     entityRoles = entityDescriptor.getRoleDescriptors();
                     if (entityRoles == null || entityRoles.isEmpty()) {
-                        log.trace("Filtering out entity descriptor {} from entity group {}", entityDescriptor
+                        log.trace("Filtering out empty entity descriptor {} from entity group {}", entityDescriptor
                                 .getEntityID(), descriptor.getName());
                         emptyEntityDescriptors.add(entityDescriptor);
                     }

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