Changeset 11399 in josm for trunk

Timestamp:

2016-12-14T16:13:11+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S2095 - Resources should be closed

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• tools/ImageProvider.java (modified) (3 diffs)

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

@@ -719 +719 @@
         try (CachedFile cache = new CachedFile(url);
              InputStream zip = cache.findZipEntryInputStream("validator.mapcss", "");
-             InputStream s = zip != null ? zip : cache.getInputStream()) {
-            result = TagCheck.readMapCSS(new BufferedReader(UTFInputStreamReader.create(s)));
+             InputStream s = zip != null ? zip : cache.getInputStream();
+             Reader reader = new BufferedReader(UTFInputStreamReader.create(s))) {
+            result = TagCheck.readMapCSS(reader);
             checks.remove(url);
             checks.putAll(url, result.parseChecks);

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

@@ -904 +904 @@
      */
     private static ImageResource getIfAvailableHttp(String url, ImageType type) {
-        CachedFile cf = new CachedFile(url)
-                .setDestDir(new File(Main.pref.getCacheDirectory(), "images").getPath());
-        try (InputStream is = cf.getInputStream()) {
+        try (CachedFile cf = new CachedFile(url).setDestDir(new File(Main.pref.getCacheDirectory(), "images").getPath());
+             InputStream is = cf.getInputStream()) {
             switch (type) {
             case SVG:
@@ -924 +923 @@
                 return img == null ? null : new ImageResource(img);
             default:
-                throw new AssertionError();
+                throw new AssertionError("Unsupported type: " + type);
             }
         } catch (IOException e) {
             Main.debug(e);
             return null;
-        } finally {
-            cf.close();
         }
     }
@@ -1226 +1223 @@
             parser.setEntityResolver((publicId, systemId) -> new InputSource(new ByteArrayInputStream(new byte[0])));
 
-            CachedFile cf = new CachedFile(base + fn).setDestDir(
-                    new File(Main.pref.getUserDataDirectory(), "images").getPath());
-            try (InputStream is = cf.getInputStream()) {
+            try (CachedFile cf = new CachedFile(base + fn).setDestDir(new File(Main.pref.getUserDataDirectory(), "images").getPath());
+                 InputStream is = cf.getInputStream()) {
                 parser.parse(new InputSource(is));
             }
-            cf.close();
         } catch (SAXReturnException r) {
             Main.trace(r);