Changeset 7037 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java

@@ -153 +153 @@
      */
     protected String downloadPluginList(String site, final ProgressMonitor monitor) {
-        BufferedReader in = null;
-
         /* replace %<x> with empty string or x=plugins (separated with comma) */
         String pl = Utils.join(",", Main.pref.getCollection("plugins"));
@@ -174 +172 @@
                 connection.setRequestProperty("Accept-Charset", "utf-8");
             }
-            in = new BufferedReader(new InputStreamReader(connection.getInputStream(), Utils.UTF_8));
-            StringBuilder sb = new StringBuilder();
-            String line;
-            while ((line = in.readLine()) != null) {
-                sb.append(line).append("\n");
-            }
-            return sb.toString();
+            try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), Utils.UTF_8))) {
+                StringBuilder sb = new StringBuilder();
+                String line;
+                while ((line = in.readLine()) != null) {
+                    sb.append(line).append("\n");
+                }
+                return sb.toString();
+            }
         } catch (MalformedURLException e) {
             if (canceled) return null;
@@ -197 +196 @@
                 connection = null;
             }
-            Utils.close(in);
             monitor.finishTask();
         }
@@ -206 +204 @@
         try (InputStream errStream = connection.getErrorStream()) {
             if (errStream != null) {
-                BufferedReader err = null;
-                try {
+                try (BufferedReader err = new BufferedReader(new InputStreamReader(errStream, Utils.UTF_8))) {
                     String line;
-                    err = new BufferedReader(new InputStreamReader(errStream, Utils.UTF_8));
                     while ((line = err.readLine()) != null) {
                         sb.append(line).append("\n");
@@ -216 +212 @@
                     Main.error(e);
                     Main.error(ex);
-                } finally {
-                    Utils.close(err);
                 }
             }