Lots of unclosed input and output streams now properly closed. They were preventing Boards Manager from working on Windows

arduino-core/src/processing/app/BaseNoGui.java

@@ -233,13 +233,6 @@ public class BaseNoGui {
     return librariesFolders;
   }
 
-  /**
-   * Return an InputStream for a file inside the Processing lib folder.
-   */
-  static public InputStream getLibStream(String filename) throws IOException {
-    return new FileInputStream(new File(getContentFile("lib"), filename));
-  }
-
   static public Platform getPlatform() {
     return platform;
   }
@@ -624,13 +617,17 @@ public class BaseNoGui {
       if (defaultLibraryJsonFile.isFile()) {
         FileUtils.copyFile(defaultLibraryJsonFile, librariesIndexFile);
       } else {
+        FileOutputStream out = null;
         try {
           // Otherwise create an empty packages index
-          FileOutputStream out = new FileOutputStream(librariesIndexFile);
+          out = new FileOutputStream(librariesIndexFile);
           out.write("{ \"libraries\" : [ ] }".getBytes());
-          out.close();
         } catch (IOException e) {
           e.printStackTrace();
+        } finally {
+          if (out != null) {
+            out.close();
+          }
         }
       }
     }

arduino-core/src/processing/app/PreferencesData.java

@@ -45,7 +45,7 @@ public class PreferencesData {
     // start by loading the defaults, in case something
     // important was deleted from the user prefs
     try {
-      prefs.load(BaseNoGui.getLibStream(PREFS_FILE));
+      prefs.load(new File(BaseNoGui.getContentFile("lib"), PREFS_FILE));
     } catch (IOException e) {
       BaseNoGui.showError(null, _("Could not read default settings.\n" +
               "You'll need to reinstall Arduino."), e);
@@ -94,41 +94,6 @@ public class PreferencesData {
   }
 
 
-  static public String[] loadStrings(InputStream input) {
-    try {
-      BufferedReader reader =
-              new BufferedReader(new InputStreamReader(input, "UTF-8"));
-
-      String lines[] = new String[100];
-      int lineCount = 0;
-      String line = null;
-      while ((line = reader.readLine()) != null) {
-        if (lineCount == lines.length) {
-          String temp[] = new String[lineCount << 1];
-          System.arraycopy(lines, 0, temp, 0, lineCount);
-          lines = temp;
-        }
-        lines[lineCount++] = line;
-      }
-      reader.close();
-
-      if (lineCount == lines.length) {
-        return lines;
-      }
-
-      // resize array to appropriate amount for these lines
-      String output[] = new String[lineCount];
-      System.arraycopy(lines, 0, output, 0, lineCount);
-      return output;
-
-    } catch (IOException e) {
-      e.printStackTrace();
-      //throw new RuntimeException("Error inside loadStrings()");
-    }
-    return null;
-  }
-
-
   static protected void save() {
     if (!doSave)
       return;
@@ -139,19 +104,25 @@ public class PreferencesData {
     if (preferencesFile == null) return;
 
     // Fix for 0163 to properly use Unicode when writing preferences.txt
-    PrintWriter writer = PApplet.createWriter(preferencesFile);
+    PrintWriter writer = null;
+    try {
+      writer = PApplet.createWriter(preferencesFile);
 
-    String[] keys = prefs.keySet().toArray(new String[0]);
-    Arrays.sort(keys);
-    for (String key: keys) {
-      if (key.startsWith("runtime."))
-        continue;
-      writer.println(key + "=" + prefs.get(key));
+      String[] keys = prefs.keySet().toArray(new String[0]);
+      Arrays.sort(keys);
+      for (String key : keys) {
+        if (key.startsWith("runtime."))
+          continue;
+        writer.println(key + "=" + prefs.get(key));
+      }
+
+      writer.flush();
+    } finally {
+      if (writer != null) {
+        writer.close();
+      }
     }
 
-    writer.flush();
-    writer.close();
-
     try {
       BaseNoGui.getPlatform().fixPrefsFilePermissions(preferencesFile);
     } catch (Exception e) {

arduino-core/src/processing/app/debug/Compiler.java

@@ -1210,12 +1210,12 @@ public class Compiler implements MessageConsumer {
     // 2. run preproc on that code using the sugg class name
     //    to create a single .java file and write to buildpath
 
+    FileOutputStream outputStream = null;
     try {
       // Output file
       File streamFile = new File(buildPath, sketch.getName() + ".cpp");
-      FileOutputStream outputStream = new FileOutputStream(streamFile);
+      outputStream = new FileOutputStream(streamFile);
       preprocessor.write(outputStream);
-      outputStream.close();
     } catch (FileNotFoundException fnfe) {
       fnfe.printStackTrace();
       String msg = _("Build folder disappeared or could not be written");
@@ -1230,6 +1230,14 @@ public class Compiler implements MessageConsumer {
       System.err.println(I18n.format(_("Uncaught exception type: {0}"), ex.getClass()));
       ex.printStackTrace();
       throw new RunnerException(ex.toString());
+    } finally {
+      if (outputStream != null) {
+        try {
+          outputStream.close();
+        } catch (IOException e) {
+          //noop
+        }
+      }
     }
 
     // grab the imports from the code just preproc'd

arduino-core/src/processing/app/helpers/PreferencesMap.java

@@ -21,18 +21,14 @@
  */
 package processing.app.helpers;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
+import processing.app.legacy.PApplet;
+
+import java.io.*;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import processing.app.legacy.PApplet;
-
 @SuppressWarnings("serial")
 public class PreferencesMap extends LinkedHashMap<String, String> {
 
@@ -71,7 +67,15 @@ public class PreferencesMap extends LinkedHashMap<String, String> {
    * @throws IOException
    */
   public void load(File file) throws IOException {
-    load(new FileInputStream(file));
+    FileInputStream fileInputStream = null;
+    try {
+      fileInputStream = new FileInputStream(file);
+      load(fileInputStream);
+    } finally {
+      if (fileInputStream != null) {
+        fileInputStream.close();
+      }
+    }
   }
 
   protected String processPlatformSuffix(String key, String suffix, boolean isCurrentPlatform) {

arduino-core/src/processing/app/legacy/PApplet.java

@@ -266,9 +266,20 @@ public class PApplet {
   }
 
   static public String[] loadStrings(File file) {
-    InputStream is = createInput(file);
-    if (is != null) return loadStrings(is);
-    return null;
+    InputStream is = null;
+    try {
+      is = createInput(file);
+      if (is != null) return loadStrings(is);
+      return null;
+    } finally {
+      if (is != null) {
+        try {
+          is.close();
+        } catch (IOException e) {
+          // noop
+        }
+      }
+    }
   }
 
   static public String[] loadStrings(InputStream input) {
@@ -319,14 +330,29 @@ public class PApplet {
 
 
   static public void saveStrings(File file, String strings[]) {
-    saveStrings(createOutput(file), strings);
+    OutputStream outputStream = null;
+    try {
+      outputStream = createOutput(file);
+      saveStrings(outputStream, strings);
+    } finally {
+      if (outputStream != null) {
+        try {
+          outputStream.close();
+        } catch (IOException e) {
+          //noop
+        }
+      }
+    }
   }
 
 
   static public void saveStrings(OutputStream output, String strings[]) {
     PrintWriter writer = createWriter(output);
-    for (int i = 0; i < strings.length; i++) {
-      writer.println(strings[i]);
+    if (writer == null) {
+      return;
+    }
+    for (String string : strings) {
+      writer.println(string);
     }
     writer.flush();
     writer.close();