Changeset 11111 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-10-09T23:25:02+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2095 - Resources should be closed

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation.tests;
 
-import static org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.FixCommand.evaluateObject;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -717 +716 @@
     public synchronized ParseResult addMapCSS(String url) throws ParseException, IOException {
         CheckParameterUtil.ensureParameterNotNull(url, "url");
-        CachedFile cache = new CachedFile(url);
-        InputStream zip = cache.findZipEntryInputStream("validator.mapcss", "");
         ParseResult result;
-        try (InputStream s = zip != null ? zip : cache.getInputStream()) {
+        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)));
             checks.remove(url);
@@ -730 +729 @@
                 }
             }
-        } finally {
-            cache.close();
         }
         return result;