Changeset 7037 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java

@@ -165 +165 @@
     @Override
     protected void realRun() throws SAXException, IOException, OsmTransferException {
-        BufferedReader bin = null;
         try {
             try {
@@ -195 +194 @@
             }
             StringBuilder changesets = new StringBuilder();
-            bin = new BufferedReader(new InputStreamReader(connection.getInputStream(), Utils.UTF_8));
-            String line;
-            while ((line = bin.readLine()) != null) {
-                changesets.append(line).append("\n");
+            try (BufferedReader bin = new BufferedReader(new InputStreamReader(connection.getInputStream(), Utils.UTF_8))) {
+                String line;
+                while ((line = bin.readLine()) != null) {
+                    changesets.append(line).append("\n");
+                }
             }
             if (! (changesets.toString().contains("<osm") && changesets.toString().contains("</osm>"))) {
@@ -215 +215 @@
             alertConnectionFailed();
             return;
-        } finally {
-            Utils.close(bin);
         }
     }