[java-identity-provider COMMIT] /trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resol...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Sep 13 10:08:16 2016
New Revision: 8388

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8388&view=rev
Log:
If there are no entries in a map for a given key get will return null...

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverParser.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverParser.java?rev=8388&r1=8387&r2=8388&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverParser.java	Tue Sep 13 10:08:16 2016
@@ -74,7 +74,7 @@
         SpringSupport.parseCustomElements(children, context);
 
         children = configChildren.get(new QName(AttributeResolverNamespaceHandler.NAMESPACE, "PrincipalConnector"));
-        if (!children.isEmpty()) {
+        if (null != children && !children.isEmpty()) {
             log.warn("{} contains deprecated PrincipalConnector elements.  "+
                     "See https://wiki.shibboleth.net/confluence/display/IDP30/NameIDConsumptionConfiguration",
                     context.getReaderContext().getResource().getDescription());