svn commit: r1677395 - /pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java

[tilman]

Author: tilman
Date: Sun May  3 12:37:15 2015
New Revision: 1677395

URL: http://svn.apache.org/r1677395
Log:
PDFBOX-2576: avoid NPE is listFiles() returns null

Modified:
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java?rev=1677395&r1=1677394&r2=1677395&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java
 Sun May  3 12:37:15 2015
@@ -50,7 +50,7 @@ import org.w3c.dom.Element;
 /**
  * This class is a simple main class used to check the validity of a pdf file.
  * 
- * Usage : java net.awl.edoc.pdfa.Validator <file path>
+ * Usage : java net.awl.edoc.pdfa.Validator &lt;file path&gt;
  * 
  * @author gbailleul
  * 
@@ -168,7 +168,7 @@ public class Validator_A1b
 
     private static int runSimple(DataSource fd) throws Exception
     {
-        ValidationResult result = null;
+        ValidationResult result;
         PreflightParser parser = new PreflightParser(fd);
         try
         {
@@ -231,7 +231,11 @@ public class Validator_A1b
         }
         else
         {
-            files.addAll(Arrays.asList(f.listFiles()));
+            File[] fileList = f.listFiles();
+            if (fileList != null)
+            {
+                files.addAll(Arrays.asList(fileList));
+            }
         }
         return files;
     }