Changeset 6268 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2013-09-27T19:50:29+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/FindBugs - Bad practice - Method may fail to close stream

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• ServerSidePreferences.java (modified) (2 diffs)
• projection/Projections.java (modified) (3 diffs)
• validation/OsmValidator.java (modified) (2 diffs)
• validation/tests/TagChecker.java (modified) (4 diffs)

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

@@ -64 +64 @@
                 BufferedReader reader = new BufferedReader(new InputStreamReader(con.getInputStream()));
                 StringBuilder b = new StringBuilder();
-                for (String line = reader.readLine(); line != null; line = reader.readLine()) {
-                    b.append(line);
-                    b.append("\n");
+                try {
+                    for (String line = reader.readLine(); line != null; line = reader.readLine()) {
+                        b.append(line);
+                        b.append("\n");
+                    }
+                } finally {
+                    reader.close();
                 }
                 if (con instanceof HttpURLConnection) {
@@ -73 +77 @@
                 return b.toString();
             } catch (IOException e) {
+                Main.error(e);
                 e.printStackTrace();
             }

trunk/src/org/openstreetmap/josm/data/projection/Projections.java

@@ -33 +33 @@
 import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -125 +126 @@
     private static void loadInits() {
         Pattern epsgPattern = Pattern.compile("<(\\d+)>(.*)<>");
+        BufferedReader r = null;
         try {
             InputStream in = new MirroredInputStream("resource://data/epsg");
-            BufferedReader r = new BufferedReader(new InputStreamReader(in));
+            r = new BufferedReader(new InputStreamReader(in));
             String line, lastline = "";
             while ((line = r.readLine()) != null) {
@@ -144 +146 @@
             }
         } catch (IOException ex) {
-            throw new RuntimeException();
+            throw new RuntimeException(ex);
+        } finally {
+            Utils.close(r);
         }
     }

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -153 +153 @@
         ignoredErrors.clear();
         if (Main.pref.getBoolean(ValidatorPreference.PREF_USE_IGNORE, true)) {
+            BufferedReader in = null;
             try {
-                final BufferedReader in = new BufferedReader(new FileReader(getValidatorDir() + "ignorederrors"));
+                in = new BufferedReader(new FileReader(getValidatorDir() + "ignorederrors"));
                 for (String line = in.readLine(); line != null; line = in.readLine()) {
                     ignoredErrors.add(line);
@@ -162 +163 @@
             } catch (final IOException e) {
                 e.printStackTrace();
+            } finally {
+                Utils.close(in);
             }
         }

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -62 +62 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.MultiMap;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -205 +206 @@
             return;
         for (String source : sources.split(";")) {
+            BufferedReader reader = null;
             try {
                 MirroredInputStream s = new MirroredInputStream(source);
@@ -213 +215 @@
                     r = new InputStreamReader(s);
                 }
-                BufferedReader reader = new BufferedReader(r);
+                reader = new BufferedReader(r);
 
                 String okValue = null;
@@ -272 +274 @@
             } catch (IOException e) {
                 errorSources += source + "\n";
+            } finally {
+                Utils.close(reader);
             }
         }