svn commit: r589254 - /mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java

[mw...@apache.org]

Author: mwebb
Date: Sat Oct 27 17:54:18 2007
New Revision: 589254

URL: http://svn.apache.org/viewvc?rev=589254&view=rev
Log:
changed the parameter of setBlacklist to an Iterable object.

Modified:
    mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java

Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java?rev=589254&r1=589253&r2=589254&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java Sat Oct 27 17:54:18 2007
@@ -22,7 +22,6 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -65,26 +64,21 @@
      * Sets the addresses to be blacklisted.
      *
      * NOTE: this call will remove any previously blacklisted addresses.
-     * FIXME: Change the parameter type to Iterable
      *
      * @param addresses a collection of InetAddress objects representing the
      *        addresses to be blacklisted.
      * @throws IllegalArgumentException if the specified collections contains
      *         non-{@link InetAddress} objects.
      */
-    public void setBlacklist(Collection<InetAddress> addresses) {
+    public void setBlacklist(Iterable<InetAddress> addresses) {
         if (addresses == null) {
             throw new NullPointerException("addresses");
         }
 
-        InetAddress[] inetAddresses = new InetAddress[addresses.size()];
-        try {
-            setBlacklist(addresses.toArray(inetAddresses));
-        } catch (ArrayStoreException ase) {
-            IllegalArgumentException iae = new IllegalArgumentException(
-                    "Collection of addresses must contain only InetAddress instances.");
-            iae.initCause(ase);
-            throw iae;
+        blacklist.clear();
+        
+        for( InetAddress address : addresses ){
+            block( address, address.getHostName() );
         }
     }