Closing a few BufferedReaders and InputStreams

joelmoniz · joelmoniz · commit 2a25bde055b9 · 2014-12-14T19:29:28.000+05:30
diff --git a/app/src/processing/app/Recent.java b/app/src/processing/app/Recent.java
@@ -84,6 +84,7 @@ protected void load() throws IOException {
           }
         }
       }
+      reader.close();
     }
     updateMenu(mainMenu);
     updateMenu(toolbarMenu);
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -4910,6 +4910,7 @@ protected PImage loadImageIO(String filename) {
       // with the old method.
       outgoing.checkAlpha();
 
+      stream.close();
       // return the image
       return outgoing;
 
@@ -5120,7 +5121,7 @@ header[17] image descriptor (packed bits)
         }
       }
     }
-
+    is.close();
     return outgoing;
   }
 
@@ -6300,7 +6301,13 @@ static public byte[] loadBytes(InputStream input) {
    */
   static public byte[] loadBytes(File file) {
     InputStream is = createInput(file);
-    return loadBytes(is);
+    byte[] byteArr = loadBytes(is);
+    try {
+      is.close();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+    return byteArr;
   }
 
   /**
@@ -6366,7 +6373,15 @@ static public String[] loadStrings(File file) {
    */
   public String[] loadStrings(String filename) {
     InputStream is = createInput(filename);
-    if (is != null) return loadStrings(is);
+    if (is != null) {
+      String[] strArr = loadStrings(is);
+      try {
+        is.close();
+      } catch (IOException e) {
+        e.printStackTrace();
+      }
+      return strArr;
+    }
 
     System.err.println("The file \"" + filename + "\" " +
                        "is missing or inaccessible, make sure " +
diff --git a/core/src/processing/core/PShapeOBJ.java b/core/src/processing/core/PShapeOBJ.java
@@ -232,6 +232,7 @@ static protected void parseOBJ(PApplet parent, String path,
               BufferedReader mreader = parent.createReader(fn);
               if (mreader != null) {
                 parseMTL(parent, path, mreader, materials, mtlTable);
+                mreader.close();
               }
             }
           } else if (parts[0].equals("g")) {

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ protected void load() throws IOException {`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`}`
	`87`	`+ reader.close();`
`87`	`88`	`}`
`88`	`89`	`updateMenu(mainMenu);`
`89`	`90`	`updateMenu(toolbarMenu);`
Original file line number	Diff line number	Diff line change
`@@ -232,6 +232,7 @@ static protected void parseOBJ(PApplet parent, String path,`
`232`	`232`	`BufferedReader mreader = parent.createReader(fn);`
`233`	`233`	`if (mreader != null) {`
`234`	`234`	`parseMTL(parent, path, mreader, materials, mtlTable);`
	`235`	`+ mreader.close();`
`235`	`236`	`}`
`236`	`237`	`}`
`237`	`238`	`} else if (parts[0].equals("g")) {`