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

[noreply at shibboleth.net]

Author: scantor
Date: Sat Jan 31 18:37:54 2015
New Revision: 7301

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7301&view=rev
Log:
IDP-586 - Data connector cache fails on null results

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java?rev=7301&r1=7300&r2=7301&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java Sat Jan 31 18:37:54 2015
@@ -17,6 +17,7 @@
 
 package net.shibboleth.idp.attribute.resolver.dc.impl;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -179,7 +180,8 @@
             if (resolvedAttributes == null) {
                 resolvedAttributes = retrieveAttributes(executable);
                 log.trace("{} Resolved attributes {}", getLogPrefix(), resolvedAttributes);
-                resultsCache.put(cacheKey, resolvedAttributes);
+                resultsCache.put(cacheKey, resolvedAttributes != null ? resolvedAttributes
+                        : Collections.<String,IdPAttribute>emptyMap());
             }
         } else {
             resolvedAttributes = retrieveAttributes(executable);