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

Timestamp:

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

Author:

stoecker

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/WMTSTileSource.java (modified) (1 diff)
• data/projection/Projections.java (modified) (1 diff)
• data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• data/validation/tests/OpeningHourTest.java (modified) (1 diff)
• data/validation/tests/TagChecker.java (modified) (1 diff)
• gui/mappaint/MapPaintStyles.java (modified) (1 diff)
• gui/tagging/presets/TaggingPresetReader.java (modified) (1 diff)
• tools/XmlObjectParser.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -293 +293 @@
         factory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
 
-        InputStream in = new CachedFile(baseUrl).
-                setHttpHeaders(headers).
+        try (CachedFile cf = new CachedFile(baseUrl); InputStream in = cf.setHttpHeaders(headers).
                 setMaxAge(7 * CachedFile.DAYS).
                 setCachingStrategy(CachedFile.CachingStrategy.IfModifiedSince).
-                getInputStream();
-        try {
+                getInputStream()) {
             byte[] data = Utils.readBytesFromStream(in);
             if (data == null || data.length == 0) {

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

@@ -269 +269 @@
     public static List<ProjectionDefinition> loadProjectionDefinitions(String path) throws IOException {
         try (
-            InputStream in = new CachedFile(path).getInputStream();
+            CachedFile cf = new CachedFile(path);
+            InputStream in = cf.getInputStream();
             BufferedReader r = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
         ) {

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));
             ) {

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -324 +324 @@
             Main.warn(tr("Failed to load Mappaint styles from ''{0}''. Exception was: {1}", entry.url, e.toString()));
             Main.error(e);
+        } finally {
+            if (cf != null) {
+                cf.close();
+            }
         }
         return null;

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java

@@ -323 +323 @@
             throws SAXException, IOException {
         Collection<TaggingPreset> tp;
-        CachedFile cf = new CachedFile(source).setHttpAccept(PRESET_MIME_TYPES);
         try (
+            CachedFile cf = new CachedFile(source).setHttpAccept(PRESET_MIME_TYPES);
             // zip may be null, but Java 7 allows it: https://blogs.oracle.com/darcy/entry/project_coin_null_try_with
             InputStream zip = cf.findZipEntryInputStream("xml", "preset")

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

@@ -289 +289 @@
     public Iterable<Object> startWithValidation(final Reader in, String namespace, String schemaSource) throws SAXException {
         SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-        try (InputStream mis = new CachedFile(schemaSource).getInputStream()) {
+        try (CachedFile cf = new CachedFile(schemaSource); InputStream mis = cf.getInputStream()) {
             Schema schema = factory.newSchema(new StreamSource(mis));
             ValidatorHandler validator = schema.newValidatorHandler();