Changeset 7033 in josm for trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java

Timestamp:

2014-05-01T02:34:43+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8465 - global use of try-with-resources, according to

• ​http://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html
• ​https://blogs.oracle.com/darcy/entry/project_coin_null_try_with

File:

• trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java

@@ -11 +11 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
@@ -184 +185 @@
     }
 
+    @SuppressWarnings("resource")
     private Pair<String, InputStream> findZipEntryImpl(String extension, String namepart) {
         if (file == null)
@@ -293 +295 @@
         String localPath = "mirror_" + a;
         destDirFile = new File(destDir, localPath + ".tmp");
-        BufferedOutputStream bos = null;
-        BufferedInputStream bis = null;
         try {
             HttpURLConnection con = connectFollowingRedirect(url, httpAccept);
-            bis = new BufferedInputStream(con.getInputStream());
-            FileOutputStream fos = new FileOutputStream(destDirFile);
-            bos = new BufferedOutputStream(fos);
-            byte[] buffer = new byte[4096];
-            int length;
-            while ((length = bis.read(buffer)) > -1) {
-                bos.write(buffer, 0, length);
-            }
-            Utils.close(bos);
-            bos = null;
-            /* close fos as well to be sure! */
-            Utils.close(fos);
-            fos = null;
+            try (
+                InputStream bis = new BufferedInputStream(con.getInputStream());
+                OutputStream fos = new FileOutputStream(destDirFile);
+                OutputStream bos = new BufferedOutputStream(fos)
+            ) {
+                byte[] buffer = new byte[4096];
+                int length;
+                while ((length = bis.read(buffer)) > -1) {
+                    bos.write(buffer, 0, length);
+                }
+            }
             localFile = new File(destDir, localPath);
             if(Main.platform.rename(destDirFile, localFile)) {
@@ -325 +323 @@
                 throw e;
             }
-        } finally {
-            Utils.close(bis);
-            Utils.close(bos);
         }