Fix some issues identified by FindBugs

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

Author: Niall Pemberton

src/java/org/apache/commons/io/FilenameUtils.java

@@ -1081,7 +1081,7 @@ public static boolean equals(
             boolean normalized, IOCase caseSensitivity) {
 
         if (filename1 == null || filename2 == null) {
-            return filename1 == filename2;
+            return (filename1 == null && filename2 == null);
         }
         if (normalized) {
             filename1 = normalize(filename1);

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

@@ -209,7 +209,8 @@ public MagicNumberFileFilter(byte[] magicNumber, long offset) {
             throw new IllegalArgumentException("The offset cannot be negative");
         }
 
-        this.magicNumbers = magicNumber;
+        this.magicNumbers = new byte[magicNumber.length];
+        System.arraycopy(magicNumber, 0, this.magicNumbers, 0, magicNumber.length);
         this.byteOffset = offset;
     }
 
@@ -237,7 +238,10 @@ public boolean accept(File file) {
                 byte[] fileBytes = new byte[this.magicNumbers.length]; 
                 randomAccessFile = new RandomAccessFile(file, "r");
                 randomAccessFile.seek(byteOffset);
-                randomAccessFile.read(fileBytes);
+                int read = randomAccessFile.read(fileBytes);
+                if (read != magicNumbers.length) {
+                    return false;
+                }
                 return Arrays.equals(this.magicNumbers, fileBytes);
             } catch (IOException ioe) {
                 // Do nothing, fall through and do not accept file

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

@@ -103,7 +103,8 @@ public NameFileFilter(String[] names, IOCase caseSensitivity) {
         if (names == null) {
             throw new IllegalArgumentException("The array of names must not be null");
         }
-        this.names = names;
+        this.names = new String[names.length];
+        System.arraycopy(names, 0, this.names, 0, names.length);
         this.caseSensitivity = (caseSensitivity == null ? IOCase.SENSITIVE : caseSensitivity);
     }
 

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

@@ -108,7 +108,8 @@ public PrefixFileFilter(String[] prefixes, IOCase caseSensitivity) {
         if (prefixes == null) {
             throw new IllegalArgumentException("The array of prefixes must not be null");
         }
-        this.prefixes = prefixes;
+        this.prefixes = new String[prefixes.length];
+        System.arraycopy(prefixes, 0, this.prefixes, 0, prefixes.length);
         this.caseSensitivity = (caseSensitivity == null ? IOCase.SENSITIVE : caseSensitivity);
     }
 

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

@@ -109,7 +109,8 @@ public SuffixFileFilter(String[] suffixes, IOCase caseSensitivity) {
         if (suffixes == null) {
             throw new IllegalArgumentException("The array of suffixes must not be null");
         }
-        this.suffixes = suffixes;
+        this.suffixes = new String[suffixes.length];
+        System.arraycopy(suffixes, 0, this.suffixes, 0, suffixes.length);
         this.caseSensitivity = (caseSensitivity == null ? IOCase.SENSITIVE : caseSensitivity);
     }
 

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

@@ -108,7 +108,8 @@ public WildcardFileFilter(String[] wildcards, IOCase caseSensitivity) {
         if (wildcards == null) {
             throw new IllegalArgumentException("The wildcard array must not be null");
         }
-        this.wildcards = wildcards;
+        this.wildcards = new String[wildcards.length];
+        System.arraycopy(wildcards, 0, this.wildcards, 0, wildcards.length);
         this.caseSensitivity = (caseSensitivity == null ? IOCase.SENSITIVE : caseSensitivity);
     }
 

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

@@ -79,7 +79,8 @@ public WildcardFilter(String[] wildcards) {
         if (wildcards == null) {
             throw new IllegalArgumentException("The wildcard array must not be null");
         }
-        this.wildcards = wildcards;
+        this.wildcards = new String[wildcards.length];
+        System.arraycopy(wildcards, 0, this.wildcards, 0, wildcards.length);
     }
 
     /**

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

@@ -942,6 +942,7 @@ public void testMagicNumberFileFilterBytes() throws Exception {
 
         File classFileA = new File(getTestDirectory(), "A.class");
         File xmlFileB = new File(getTestDirectory(), "B.xml");
+        File emptyFile = new File(getTestDirectory(), "C.xml");
         File dir = new File(getTestDirectory(), "D");
         dir.mkdirs();
 
@@ -951,17 +952,21 @@ public void testMagicNumberFileFilterBytes() throws Exception {
         classFileAStream.close();
 
         FileUtils.write(xmlFileB, xmlFileContent);
+        FileUtils.touch(emptyFile);
 
         IOFileFilter filter = new MagicNumberFileFilter(classFileMagicNumber);
 
         assertFiltering(filter, classFileA, true);
         assertFiltering(filter, xmlFileB, false);
+        assertFiltering(filter, emptyFile, false);
         assertFiltering(filter, dir, false);
 
+        
         filter = FileFilterUtils.magicNumberFileFilter(classFileMagicNumber);
 
         assertFiltering(filter, classFileA, true);
         assertFiltering(filter, xmlFileB, false);
+        assertFiltering(filter, emptyFile, false);
         assertFiltering(filter, dir, false);
     }