[java-identity-provider] branch master updated: Leave attribute descriptions unset if not already set.

[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=4401edd5056b786bc147dc4ad12c1a4f5877f2e5

The following commit(s) were added to refs/heads/master by this push:
       new  4401edd   Leave attribute descriptions unset if not already set.
4401edd is described below

commit 4401edd5056b786bc147dc4ad12c1a4f5877f2e5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jun 3 12:10:03 2019 -0400

    Leave attribute descriptions unset if not already set.
---
 .../idp/attribute/resolver/impl/AttributeResolverImpl.java       | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
index 75c5dd7..31ff44d 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
@@ -551,18 +551,15 @@ public class AttributeResolverImpl extends AbstractServiceableComponent<Attribut
                 }
                 final IdPAttribute newAttr = new IdPAttribute(attribute.getId());
                 newAttr.setValues(values);
-                if (attribute.getDisplayDescriptions().size() > 0) {
-                    newAttr.setDisplayDescriptions(attribute.getDisplayDescriptions());
-                } else {
-                    newAttr.setDisplayDescriptions(Map.of(Locale.getDefault(),
-                            dataConnector.getId() + "/" + attribute.getId()));
-                }
                 if (attribute.getDisplayNames().size() > 0) {
                     newAttr.setDisplayNames(attribute.getDisplayNames());
                 } else {
                     newAttr.setDisplayNames(Map.of(Locale.getDefault(),
                             dataConnector.getId() + "/" + attribute.getId()));
                 }
+                if (attribute.getDisplayDescriptions().size() > 0) {
+                    newAttr.setDisplayDescriptions(attribute.getDisplayDescriptions());
+                }
                 resolvedAttributes.put(attribute.getId(), newAttr);
             }
         }

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