[java-identity-provider] branch master updated: IDP-1383 - SourceAttribute warning appears regardless of presence

[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=64950bc1392b0a234a331be1d2de504838c0fc3c

The following commit(s) were added to refs/heads/master by this push:
       new  64950bc   IDP-1383 - SourceAttribute warning appears regardless of presence
64950bc is described below

commit 64950bc1392b0a234a331be1d2de504838c0fc3c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Dec 20 08:42:48 2018 -0500

    IDP-1383 - SourceAttribute warning appears regardless of presence
    
    https://issues.shibboleth.net/jira/browse/IDP-1383
---
 .../resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java
index b229346..833648e 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java
@@ -99,7 +99,7 @@ public class TemplateAttributeDefinitionParser extends AbstractWarningAttributeD
         final List<Element> sourceAttributeElements =
                 ElementSupport.getChildElements(config, SOURCE_ATTRIBUTE_ELEMENT_NAME_AD);
         sourceAttributeElements.addAll(ElementSupport.getChildElements(config, SOURCE_ATTRIBUTE_ELEMENT_NAME_RESOLVER));
-        if (null != sourceAttributeElements) {
+        if (null != sourceAttributeElements && !sourceAttributeElements.isEmpty()) {
             DeprecationSupport.warnOnce(ObjectType.ELEMENT, SOURCE_ATTRIBUTE_ELEMENT_NAME_RESOLVER.getLocalPart(),
                     parserContext.getReaderContext().getResource().getDescription(),
                     "by using <InputAttributeDefinition> and <InputDataConnector>");

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