don't wrap null InputStream in a BufferedInputStream, also more file checks for non-existence

benfry · benfry · commit c0b05cf1c6df · 2017-04-25T11:59:02.000-04:00
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -6927,18 +6927,22 @@ static public PrintWriter createWriter(OutputStream output) {
    */
   public InputStream createInput(String filename) {
     InputStream input = createInputRaw(filename);
-    final String lower = filename.toLowerCase();
-    if ((input != null) &&
-        (lower.endsWith(".gz") || lower.endsWith(".svgz"))) {
-      try {
-        // buffered has to go *around* the GZ, otherwise 25x slower
-        return new BufferedInputStream(new GZIPInputStream(input));
-      } catch (IOException e) {
-        printStackTrace(e);
-        return null;
+    if (input != null) {
+      // if it's gzip-encoded, automatically decode
+      final String lower = filename.toLowerCase();
+      if (lower.endsWith(".gz") || lower.endsWith(".svgz")) {
+        try {
+          // buffered has to go *around* the GZ, otherwise 25x slower
+          return new BufferedInputStream(new GZIPInputStream(input));
+
+        } catch (IOException e) {
+          printStackTrace(e);
+        }
+      } else {
+        return new BufferedInputStream(input);
       }
     }
-    return new BufferedInputStream(input);
+    return null;
   }
 
 
@@ -7109,9 +7113,14 @@ static public InputStream createInput(File file) {
     if (file == null) {
       throw new IllegalArgumentException("File passed to createInput() was null");
     }
+    if (!file.exists()) {
+      System.err.println(file + " does not exist, createInput() will return null");
+      return null;
+    }
     try {
       InputStream input = new FileInputStream(file);
-      if (file.getName().toLowerCase().endsWith(".gz")) {
+      final String lower = file.getName().toLowerCase();
+      if (lower.endsWith(".gz") || lower.endsWith(".svgz")) {
         return new BufferedInputStream(new GZIPInputStream(input));
       }
       return new BufferedInputStream(input);
@@ -7247,6 +7256,11 @@ static public byte[] loadBytes(InputStream input) {
    * @nowebref
    */
   static public byte[] loadBytes(File file) {
+    if (!file.exists()) {
+      System.err.println(file + " does not exist, loadBytes() will return null");
+      return null;
+    }
+
     try {
       InputStream input;
       int length;
@@ -7295,6 +7309,11 @@ static public byte[] loadBytes(File file) {
    * @nowebref
    */
   static public String[] loadStrings(File file) {
+    if (!file.exists()) {
+      System.err.println(file + " does not exist, loadStrings() will return null");
+      return null;
+    }
+
     InputStream is = createInput(file);
     if (is != null) {
       String[] outgoing = loadStrings(is);
diff --git a/core/todo.txt b/core/todo.txt
@@ -3,6 +3,8 @@ X add (far) more efficient file loading for loadBytes(File)
 X add loadBytes(URL) variant that uses content length header for array size
 X keyPressed is false if one key is released while multiple keys are pressed
 X   https://github.com/processing/processing/issues/4993
+X createInput() wasn't returning null for files that were not found
+X   https://github.com/processing/processing/issues/5026
 
 andres
 X Assigning Pixels Vertically Flipped in P2D
