Changeset 7037 in josm for trunk/src/org/openstreetmap/josm/io/NmeaReader.java

Timestamp:

2014-05-01T16:28:25+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8465 - last batch of try-with-resources

File:

• trunk/src/org/openstreetmap/josm/io/NmeaReader.java (modified) (2 diffs)

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

@@ -174 +174 @@
         Collection<Collection<WayPoint>> currentTrack = new ArrayList<>();
 
-        BufferedReader rd = null;
-        try {
-            rd = new BufferedReader(new InputStreamReader(source, Utils.UTF_8));
-
+        try (BufferedReader rd = new BufferedReader(new InputStreamReader(source, Utils.UTF_8))) {
             StringBuilder sb = new StringBuilder(1024);
             int loopstart_char = rd.read();
@@ -209 +206 @@
         } catch (Exception e) {
             Main.warn(e);
-        } finally {
-            Utils.close(rd);
-        }
-    }
+        }
+    }
+
     private static class NMEAParserState {
         protected Collection<WayPoint> waypoints = new ArrayList<>();