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

Timestamp:

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

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

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -131 +130 @@
      */
     protected DataSet getReferringWays(ProgressMonitor progressMonitor) throws OsmTransferException {
-        InputStream in = null;
         progressMonitor.beginTask(null, 2);
         try {
@@ -139 +137 @@
             .append("/").append(id).append("/ways");
 
-            in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true));
-            if (in == null)
-                return null;
-            progressMonitor.subTask(tr("Downloading referring ways ..."));
-            return OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, true));
+            try (InputStream in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true))) {
+                if (in == null)
+                    return null;
+                progressMonitor.subTask(tr("Downloading referring ways ..."));
+                return OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, true));
+            }
         } catch(OsmTransferException e) {
             throw e;
@@ -152 +151 @@
         } finally {
             progressMonitor.finishTask();
-            Utils.close(in);
             activeConnection = null;
         }
@@ -165 +163 @@
      */
     protected DataSet getReferringRelations(ProgressMonitor progressMonitor) throws OsmTransferException {
-        InputStream in = null;
         progressMonitor.beginTask(null, 2);
         try {
@@ -173 +170 @@
             .append("/").append(id).append("/relations");
 
-            in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true));
-            if (in == null)
-                return null;
-            progressMonitor.subTask(tr("Downloading referring relations ..."));
-            return OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, true));
+            try (InputStream in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true))) {
+                if (in == null)
+                    return null;
+                progressMonitor.subTask(tr("Downloading referring relations ..."));
+                return OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, true));
+            }
         } catch(OsmTransferException e) {
             throw e;
@@ -186 +184 @@
         } finally {
             progressMonitor.finishTask();
-            Utils.close(in);
             activeConnection = null;
         }