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

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -15 +15 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.Reader;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -368 +369 @@
                 }
                 connection.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
-                InputStream inputStream = connection.getInputStream();
-                InputSource inputSource = new InputSource(new InputStreamReader(inputStream, Utils.UTF_8));
-                NameFinderResultParser parser = new NameFinderResultParser();
-                SAXParserFactory.newInstance().newSAXParser().parse(inputSource, parser);
-                this.data = parser.getResult();
+                try (
+                    InputStream inputStream = connection.getInputStream();
+                    Reader reader = new InputStreamReader(inputStream, Utils.UTF_8);
+                ) {
+                    InputSource inputSource = new InputSource(reader);
+                    NameFinderResultParser parser = new NameFinderResultParser();
+                    SAXParserFactory.newInstance().newSAXParser().parse(inputSource, parser);
+                    this.data = parser.getResult();
+                }
             } catch(Exception e) {
                 if (canceled)