You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2015/06/27 09:22:37 UTC
svn commit: r1687886 -
/commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java
Author: ggregory
Date: Sat Jun 27 07:22:37 2015
New Revision: 1687886
URL: http://svn.apache.org/r1687886
Log:
Fix NPE since java.io.File.listFiles(FileFilter) can return null.
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java?rev=1687886&r1=1687885&r2=1687886&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java (original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java Sat Jun 27 07:22:37 2015
@@ -3141,6 +3141,6 @@ public class FileUtils {
}
}
);
- return fileInDir.length > 0;
+ return fileInDir != null && fileInDir.length > 0;
}
}