[java-opensaml COMMIT] /trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConf...

[noreply at shibboleth.net]

Author: putmanb
Date: Tue May  6 19:23:04 2014
New Revision: 3840

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3840&view=rev
Log:
Be consistent with other -Config classes and allow a null white/blacklist to be passed. Just convert internally to an empty set.

Modified:
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java?rev=3840&r1=3839&r2=3840&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicWhitelistBlacklistConfiguration.java Tue May  6 19:23:04 2014
@@ -83,7 +83,10 @@
      * @param uris the list of algorithms
      */
     public void setWhitelistedAlgorithmURIs(@Nonnull @NonnullElements final Collection<String> uris) {
-        Constraint.isNotNull(uris, "Whitelist may not be null");
+        if (uris == null) {
+            whitelist = Collections.emptySet();
+            return;
+        }
         whitelist = Lists.newArrayList(Collections2.filter(uris, Predicates.notNull()));
     }
 
@@ -117,7 +120,10 @@
      * @param uris the list of algorithms
      */
     public void setBlacklistedAlgorithmURIs(@Nonnull @NonnullElements final Collection<String> uris) {
-        Constraint.isNotNull(uris, "Blacklist may not be null");
+        if (uris == null) {
+            blacklist = Collections.emptySet();
+            return;
+        }
         blacklist = Lists.newArrayList(Collections2.filter(uris, Predicates.notNull()));
     }