Closing streams using IOUtils.closeQuietly

Fixed badly handled stream found in the meanwhile

Author: Federico Fissore

app/src/processing/app/Base.java

@@ -39,6 +39,7 @@
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
+import org.apache.commons.compress.utils.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import processing.app.debug.TargetBoard;
 import processing.app.debug.TargetPackage;
@@ -2517,9 +2518,7 @@ static public byte[] loadBytesRaw(File file) throws IOException {
       }
       return buffer;
     } finally {
-      if (input != null) {
-        input.close();
-      }
+      IOUtils.closeQuietly(input);
     }
   }
 
@@ -2567,12 +2566,8 @@ static public void copyFile(File sourceFile,
       }
       to.flush();
     } finally {
-      if (from != null) {
-        from.close(); // ??
-      }
-      if (to != null) {
-        to.close(); // ??
-      }
+      IOUtils.closeQuietly(from);
+      IOUtils.closeQuietly(to);
     }
 
     targetFile.setLastModified(sourceFile.lastModified());

app/src/processing/app/Editor.java

@@ -28,6 +28,7 @@
 import com.google.common.base.Predicate;
 import com.jcraft.jsch.JSchException;
 import jssc.SerialPortException;
+import org.apache.commons.compress.utils.IOUtils;
 import processing.app.debug.*;
 import processing.app.forms.PasswordAuthorizationDialog;
 import processing.app.helpers.OSUtils;
@@ -965,11 +966,7 @@ protected String findClassInZipFile(String base, File file) {
       //System.err.println("Ignoring " + filename + " (" + e.getMessage() + ")");
       e.printStackTrace();
     } finally {
-      if (zipFile != null)
-        try {
-          zipFile.close();
-        } catch (IOException e) {
-        }
+      IOUtils.closeQuietly(zipFile);
     }
     return null;
   }

app/src/processing/app/EditorConsoleStream.java

@@ -1,6 +1,7 @@
 package processing.app;
 
 import cc.arduino.files.DeleteFilesOnShutdown;
+import org.apache.commons.compress.utils.IOUtils;
 
 import static processing.app.I18n._;
 
@@ -82,17 +83,13 @@ public static void quit() {
     System.setErr(systemErr);
 
     // close the PrintStream
-    consoleOut.close();
-    consoleErr.close();
+    IOUtils.closeQuietly(consoleOut);
+    IOUtils.closeQuietly(consoleErr);
 
     // also have to close the original FileOutputStream
     // otherwise it won't be shut down completely
-    try {
-      stdoutFile.close();
-      stderrFile.close();
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
+    IOUtils.closeQuietly(stdoutFile);
+    IOUtils.closeQuietly(stderrFile);
 
     outFile.delete();
     errFile.delete();
@@ -149,4 +146,4 @@ static public void setCurrent(EditorConsole console) {
     currentConsole = console;
   }
 
-}
+}

app/src/processing/app/UpdateCheck.java

@@ -22,6 +22,7 @@
 
 package processing.app;
 
+import org.apache.commons.compress.utils.IOUtils;
 import processing.app.legacy.PApplet;
 
 import javax.swing.*;
@@ -133,9 +134,7 @@ protected int readInt(String filename) throws IOException {
       reader = new BufferedReader(new InputStreamReader(url.openStream()));
       return Integer.parseInt(reader.readLine());
     } finally {
-      if (reader != null) {
-        reader.close();
-      }
+      IOUtils.closeQuietly(reader);
     }
   }
 }

app/src/processing/app/syntax/PdeKeywords.java

@@ -25,6 +25,7 @@
 package processing.app.syntax;
 
 import cc.arduino.contributions.libraries.ContributedLibrary;
+import org.apache.commons.compress.utils.IOUtils;
 import org.fife.ui.rsyntaxtextarea.TokenMap;
 import org.fife.ui.rsyntaxtextarea.TokenTypes;
 import processing.app.Base;
@@ -126,9 +127,7 @@ private void parseKeywordsTxt(File input) throws Exception {
 
       fillMissingTokenType();
     } finally {
-      if (reader != null) {
-        reader.close();
-      }
+      IOUtils.closeQuietly(reader);
     }
 
   }

app/src/processing/app/syntax/SketchTextArea.java

@@ -30,6 +30,7 @@
 
 package processing.app.syntax;
 
+import org.apache.commons.compress.utils.IOUtils;
 import org.fife.ui.rsyntaxtextarea.*;
 import org.fife.ui.rsyntaxtextarea.Theme;
 import org.fife.ui.rsyntaxtextarea.Token;
@@ -102,9 +103,7 @@ public void setTheme(String name) throws IOException {
       Theme theme = Theme.load(defaultXmlInputStream);
       theme.apply(this);
     } finally {
-      if (defaultXmlInputStream != null) {
-        defaultXmlInputStream.close();
-      }
+      IOUtils.closeQuietly(defaultXmlInputStream);
     }
 
     setForeground(processing.app.Theme.getColor("editor.fgcolor"));

app/src/processing/app/tools/Archiver.java

@@ -23,6 +23,7 @@
 
 package processing.app.tools;
 
+import org.apache.commons.compress.utils.IOUtils;
 import processing.app.Base;
 import processing.app.Editor;
 import processing.app.Sketch;
@@ -124,22 +125,21 @@ public void run() {
     if (filename != null) {
       newbie = new File(directory, filename);
 
+      ZipOutputStream zos = null;
       try {
         //System.out.println(newbie);
-        FileOutputStream zipOutputFile = new FileOutputStream(newbie);
-        ZipOutputStream zos = new ZipOutputStream(zipOutputFile);
+        zos = new ZipOutputStream(new FileOutputStream(newbie));
 
         // recursively fill the zip file
         buildZip(location, name, zos);
 
         // close up the jar file
         zos.flush();
-        zos.close();
-
         editor.statusNotice("Created archive " + newbie.getName() + ".");
-
       } catch (IOException e) {
         e.printStackTrace();
+      } finally {
+        IOUtils.closeQuietly(zos);
       }
     } else {
       editor.statusNotice(_("Archive sketch canceled."));

app/src/processing/app/tools/FixEncoding.java

@@ -29,6 +29,7 @@
 
 import javax.swing.JOptionPane;
 
+import org.apache.commons.compress.utils.IOUtils;
 import processing.app.*;
 import static processing.app.I18n._;
 
@@ -83,16 +84,19 @@ public void run() {
 
   protected String loadWithLocalEncoding(File file) throws IOException {
     // FileReader uses the default encoding, which is what we want.
-    FileReader fr = new FileReader(file);
-    BufferedReader reader = new BufferedReader(fr);
-
-    StringBuffer buffer = new StringBuffer();
-    String line = null;
-    while ((line = reader.readLine()) != null) {
-      buffer.append(line);
-      buffer.append('\n');
+    BufferedReader reader = null;
+    try {
+      reader = new BufferedReader(new FileReader(file));
+
+      StringBuffer buffer = new StringBuffer();
+      String line;
+      while ((line = reader.readLine()) != null) {
+        buffer.append(line);
+        buffer.append('\n');
+      }
+      return buffer.toString();
+    } finally {
+      IOUtils.closeQuietly(reader);
     }
-    reader.close();
-    return buffer.toString();
   }
 }

app/src/processing/app/tools/ZipDeflater.java

@@ -10,6 +10,7 @@
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 
+import org.apache.commons.compress.utils.IOUtils;
 import processing.app.helpers.FileUtils;
 
 public class ZipDeflater {
@@ -54,12 +55,8 @@ public void deflate() throws IOException {
             fos.write(buffer, 0, len);
           }
         } finally {
-          if (fos != null) {
-            fos.close();
-          }
-          if (zipInputStream != null) {
-            zipInputStream.close();
-          }
+          IOUtils.closeQuietly(fos);
+          IOUtils.closeQuietly(zipInputStream);
         }
       }
     }

app/test/processing/app/I18NTest.java

@@ -29,6 +29,7 @@
 
 package processing.app;
 
+import org.apache.commons.compress.utils.IOUtils;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -63,9 +64,7 @@ private Properties loadProperties(File file) throws IOException {
       is = new FileInputStream(file);
       properties.load(is);
     } finally {
-      if (is != null) {
-        is.close();
-      }
+      IOUtils.closeQuietly(is);
     }
     return properties;
   }

arduino-core/src/cc/arduino/contributions/GPGDetachedSignatureVerifier.java

@@ -77,12 +77,8 @@ public boolean verify(File signedFile, File signature, File publicKey) throws IO
 
       return pgpSignature.verify();
     } finally {
-      if (signatureInputStream != null) {
-        signatureInputStream.close();
-      }
-      if (signedFileInputStream != null) {
-        signedFileInputStream.close();
-      }
+      IOUtils.closeQuietly(signatureInputStream);
+      IOUtils.closeQuietly(signedFileInputStream);
     }
   }
 
@@ -92,9 +88,7 @@ private PGPPublicKey readPublicKey(File file, String keyId) throws IOException,
       keyIn = new BufferedInputStream(new FileInputStream(file));
       return readPublicKey(keyIn, keyId);
     } finally {
-      if (keyIn != null) {
-        keyIn.close();
-      }
+      IOUtils.closeQuietly(keyIn);
     }
   }
 

arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java

@@ -37,6 +37,7 @@
 import com.fasterxml.jackson.module.mrbean.MrBeanModule;
 import com.google.common.base.Function;
 import com.google.common.collect.FluentIterable;
+import org.apache.commons.compress.utils.IOUtils;
 import processing.app.BaseNoGui;
 import processing.app.I18n;
 import processing.app.helpers.FileUtils;
@@ -96,9 +97,7 @@ private void parseIndex(File indexFile) throws IOException {
         }
       }
     } finally {
-      if (indexIn != null) {
-        indexIn.close();
-      }
+      IOUtils.closeQuietly(indexIn);
     }
   }
 

arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java

@@ -44,6 +44,7 @@
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Multimaps;
+import org.apache.commons.compress.utils.IOUtils;
 import processing.app.BaseNoGui;
 import processing.app.debug.TargetPackage;
 import processing.app.debug.TargetPlatform;
@@ -172,9 +173,7 @@ private ContributionsIndex parseIndex(File indexFile) throws IOException {
       mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
       return mapper.readValue(inputStream, ContributionsIndex.class);
     } finally {
-      if (inputStream != null) {
-        inputStream.close();
-      }
+      IOUtils.closeQuietly(inputStream);
     }
   }
 

arduino-core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java

@@ -33,6 +33,7 @@
 import cc.arduino.packages.Discovery;
 import cc.arduino.packages.discoverers.network.BoardReachabilityFilter;
 import cc.arduino.packages.discoverers.network.NetworkChecker;
+import org.apache.commons.compress.utils.IOUtils;
 import processing.app.BaseNoGui;
 import processing.app.helpers.PreferencesMap;
 import processing.app.zeroconf.jmdns.ArduinoDNSTaskStarter;
@@ -199,12 +200,6 @@ public void inetAddressAdded(InetAddress address) {
   @Override
   public void inetAddressRemoved(InetAddress address) {
     JmDNS jmDNS = mappedJmDNSs.remove(address);
-    if (jmDNS != null) {
-      try {
-        jmDNS.close();
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
-    }
+    IOUtils.closeQuietly(jmDNS);
   }
 }

arduino-core/src/cc/arduino/packages/ssh/SCP.java

@@ -32,6 +32,7 @@
 import com.jcraft.jsch.Channel;
 import com.jcraft.jsch.ChannelExec;
 import com.jcraft.jsch.Session;
+import org.apache.commons.compress.utils.IOUtils;
 
 import java.io.*;
 
@@ -61,12 +62,8 @@ public void open() throws IOException {
   }
 
   public void close() throws IOException {
-    if (out != null) {
-      out.close();
-    }
-    if (in != null) {
-      in.close();
-    }
+    IOUtils.closeQuietly(out);
+    IOUtils.closeQuietly(in);
     if (channel != null) {
       channel.disconnect();
     }
@@ -118,9 +115,7 @@ public void sendFile(File localFile, String remoteFile) throws IOException {
       buf[0] = 0;
       out.write(buf, 0, 1);
     } finally {
-      if (fis != null) {
-        fis.close();
-      }
+      IOUtils.closeQuietly(fis);
     }
 
     ensureAcknowledged();