Handle null List constructor more gracefully

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@232900 13f79535-47bb-0310-9956-ffa450edef68

Author: Stephen Colebourne

src/java/org/apache/commons/io/filefilter/AndFileFilter.java

@@ -42,6 +42,7 @@ public class AndFileFilter
 
     /**
      * Constructs a new instance of <code>AndFileFilter</code>.
+     *
      * @since Commons IO 1.1
      */
     public AndFileFilter() {
@@ -51,14 +52,16 @@ public AndFileFilter() {
     /**
      * Constructs a new instance of <code>AndFileFilter</code>
      * with the specified list of filters.
-     * @param fileFilters a List of IOFileFilter instances
+     *
+     * @param fileFilters  a List of IOFileFilter instances, copied, null ignored
      * @since Commons IO 1.1
      */
     public AndFileFilter(final List fileFilters) {
         if (fileFilters == null) {
-            throw new IllegalArgumentException("The filters List must not be null");
+            this.fileFilters = new ArrayList();
+        } else {
+            this.fileFilters = new ArrayList(fileFilters);
         }
-        this.fileFilters = new ArrayList(fileFilters);
     }
 
     /**

src/java/org/apache/commons/io/filefilter/OrFileFilter.java

@@ -42,6 +42,7 @@ public class OrFileFilter
 
     /**
      * Constructs a new instance of <code>OrFileFilter</code>.
+     *
      * @since Commons IO 1.1
      */
     public OrFileFilter() {
@@ -52,11 +53,15 @@ public OrFileFilter() {
      * Constructs a new instance of <code>OrFileFilter</code>
      * with the specified filters.
      *
-     * @param fileFilters the file filters for this filter
+     * @param fileFilters  the file filters for this filter, copied, null ignored
      * @since Commons IO 1.1
      */
     public OrFileFilter(final List fileFilters) {
-        this.fileFilters = new ArrayList(fileFilters);
+        if (fileFilters == null) {
+            this.fileFilters = new ArrayList();
+        } else {
+            this.fileFilters = new ArrayList(fileFilters);
+        }
     }
 
     /**

src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java

@@ -209,7 +209,7 @@ public void testNameFilter() throws Exception {
     public void testNameFilterNullArgument() throws Exception {
     	String test = null;
     	try {
-    		IOFileFilter filter = new NameFileFilter(test);
+    		new NameFileFilter(test);
     		fail( "constructing a NameFileFilter with a null String argument should fail.");
     	} catch( IllegalArgumentException iae ) {
     	}
@@ -218,7 +218,7 @@ public void testNameFilterNullArgument() throws Exception {
     public void testNameFilterNullArrayArgument() throws Exception {
     	String[] test = null;
     	try {
-    		IOFileFilter filter = new NameFileFilter(test);
+    		new NameFileFilter(test);
     		fail( "constructing a NameFileFilter with a null String[] argument should fail.");
     	} catch( IllegalArgumentException iae ) {
     	}
@@ -227,7 +227,7 @@ public void testNameFilterNullArrayArgument() throws Exception {
     public void testNameFilterNullListArgument() throws Exception {
     	List test = null;
     	try {
-    		IOFileFilter filter = new NameFileFilter(test);
+    		new NameFileFilter(test);
     		fail( "constructing a NameFileFilter with a null List argument should fail.");
     	} catch( IllegalArgumentException iae ) {
     	}
@@ -277,12 +277,9 @@ public void testAnd() throws Exception {
         } catch (IllegalArgumentException ex) {
         }
 
-        try {
-            new AndFileFilter((List) null);
-            fail();
-        } catch (IllegalArgumentException ex) {
-        }
-}
+        AndFileFilter f = new AndFileFilter((List) null);
+        assertEquals(true, f.getFileFilters().isEmpty());
+    }
 
     public void testOr() throws Exception {
         IOFileFilter trueFilter = TrueFileFilter.INSTANCE;
@@ -316,9 +313,11 @@ public void testOr() throws Exception {
             fail();
         } catch (IllegalArgumentException ex) {
         }
+        
+        OrFileFilter f = new OrFileFilter((List) null);
+        assertEquals(true, f.getFileFilters().isEmpty());
     }
 
-
     public void testWildcard() throws Exception {
         IOFileFilter filter = new WildcardFilter("*.txt");
         List patternList = Arrays.asList( new String[] { "*.txt", "*.xml", "*.gif" } );