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

[noreply at shibboleth.net]

Author: dfisher
Date: Fri Feb 14 11:33:34 2014
New Revision: 5381

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5381&view=rev
Log:
More for IDP-354.
Allow cache to be null for data connectors.

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

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/AbstractSearchDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/AbstractSearchDataConnector.java?rev=5381&r1=5380&r2=5381&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/AbstractSearchDataConnector.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/AbstractSearchDataConnector.java Fri Feb 14 11:33:34 2014
@@ -164,11 +164,13 @@
      * 
      * @param cache cache used to cache search results
      */
-    public void setResultsCache(@Nonnull final Cache<String, Map<String, IdPAttribute>> cache) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
-
-        cache.invalidateAll();
+    public void setResultsCache(@Nullable final Cache<String, Map<String, IdPAttribute>> cache) {
+        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
+
+        if (cache != null) {
+            cache.invalidateAll();
+        }
         resultsCache = cache;
     }