Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 11397)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 11399)
@@ -719,6 +719,7 @@
         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);
Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 11397)
+++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 11399)
@@ -904,7 +904,6 @@
      */
     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,11 +923,9 @@
                 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,10 +1223,8 @@
             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);