Changeset 7033 in josm for trunk/src/org/openstreetmap/josm/io/CacheFiles.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/CacheFiles.java (modified) (2 diffs)

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

@@ -114 +114 @@
 
             byte[] bytes = new byte[(int) data.length()];
-            new RandomAccessFile(data, "r").readFully(bytes);
+            try (RandomAccessFile raf = new RandomAccessFile(data, "r")) {
+                raf.readFully(bytes);
+            }
             return bytes;
         } catch (Exception e) {
@@ -135 +137 @@
             }
             // rws also updates the file meta-data, i.e. last mod time
-            RandomAccessFile raf = new RandomAccessFile(f, "rws");
-            try {
+            try (RandomAccessFile raf = new RandomAccessFile(f, "rws")) {
                 raf.write(data);
-            } finally {
-                Utils.close(raf);
             }
         } catch (Exception e) {