Changeset 9799 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests

Timestamp:

2016-02-14T20:49:43+01:00 (8 years ago)

Author:

stoecker

Message:

fix Coverity issues 1349911, 1349912, 1349913, 1349917, 1349918, 1349919, 1349922, 1349923

Location:

trunk/src/org/openstreetmap/josm/data/validation/tests

Files:

• MapCSSTagChecker.java (modified) (1 diff)
• OpeningHourTest.java (modified) (1 diff)
• TagChecker.java (modified) (1 diff)

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

@@ -719 +719 @@
                 }
             }
+        } finally {
+            cache.close();
         }
         return result;

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

@@ -53 +53 @@
         super.initialize();
         if (ENGINE != null) {
-            try (Reader reader = new InputStreamReader(
-                    new CachedFile("resource://data/validator/opening_hours.js").getInputStream(), StandardCharsets.UTF_8)) {
+            try (CachedFile cf = new CachedFile("resource://data/validator/opening_hours.js");
+                 Reader reader = new InputStreamReader(cf.getInputStream(), StandardCharsets.UTF_8)) {
                 ENGINE.eval(reader);
                 ENGINE.eval("var opening_hours = require('opening_hours');");

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

@@ -166 +166 @@
         for (String source : Main.pref.getCollection(PREF_SOURCES, DEFAULT_SOURCES)) {
             try (
-                InputStream s = new CachedFile(source).getInputStream();
+                CachedFile cf = new CachedFile(source);
+                InputStream s = cf.getInputStream();
                 BufferedReader reader = new BufferedReader(UTFInputStreamReader.create(s));
             ) {