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

Timestamp:

2014-05-01T02:34:43+02:00 (10 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/OsmServerObjectReader.java (modified) (4 diffs)

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

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -116 +115 @@
         }
         progressMonitor.beginTask("", 1);
-        InputStream in = null;
         try {
             progressMonitor.indeterminateSubTask(tr("Downloading OSM data..."));
@@ -129 +127 @@
             }
 
-            in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true));
-            if (in == null)
-                return null;
-            return OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+            try (InputStream in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true))) {
+                if (in == null)
+                    return null;
+                return OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+            }
         } catch(OsmTransferException e) {
             if (cancel) return null;
@@ -141 +140 @@
         } finally {
             progressMonitor.finishTask();
-            Utils.close(in);
             activeConnection = null;
         }