Changeset 5839 in josm

Timestamp:

2013-04-11T19:41:05+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8570 - close more streams

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Version.java (modified) (1 diff)
• gui/layer/TMSLayer.java (modified) (1 diff)
• tools/I18n.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Version.java

@@ -40 +40 @@
             in = new BufferedReader(new InputStreamReader(resource.openStream(), "UTF-8"));
             StringBuffer sb = new StringBuffer();
-            for (String line = in.readLine(); line != null; line = in.readLine()) {
-                sb.append(line).append("\n");
+            try {
+                for (String line = in.readLine(); line != null; line = in.readLine()) {
+                    sb.append(line).append("\n");
+                }
+            } finally {
+                in.close();
             }
             s = sb.toString();

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -323 +323 @@
                 UTFInputStreamReader in = UTFInputStreamReader.create(u.openStream(), "utf-8");
                 String r = new Scanner(in).useDelimiter("\\A").next();
+                in.close();
                 System.out.println("Successfully loaded Bing attribution data.");
                 return r.getBytes("utf-8");

trunk/src/org/openstreetmap/josm/tools/I18n.java

@@ -469 +469 @@
                 return false;
         }
-        try
-        {
-            if(load(en.openStream(), tr.openStream(), false))
-            {
+        InputStream enStream = null;
+        InputStream trStream = null;
+        try {
+            enStream = en.openStream();
+            trStream = tr.openStream();
+            if (load(enStream, trStream, false)) {
                 pluralMode = languages.get(l);
                 loadedCode = l;
                 return true;
             }
-        }
-        catch(IOException e)
-        {
+        } catch(IOException e) {
+            // Ignore exception
+        } finally {
+            if (trStream != null) try {trStream.close();} catch(IOException e) {}
+            if (enStream != null) try {enStream.close();} catch(IOException e) {}
         }
         return false;