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

Timestamp:

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

Author:

stoecker

Message:

fix Coverity issues 1351364 and 1351265

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)
• preferences/PreferencesReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -243 +243 @@
         public long generateTime;
         public long sortTime;
-        public long drawTime;
         public Map<Class<? extends StyleElement>, Integer> styleElementCount;
         public boolean skipDraw;
@@ -1961 +1960 @@
                 timeFinished = System.currentTimeMillis();
                 if (benchmarkData != null) {
-                    benchmarkData.drawTime = timeFinished - timeGenerateDone;
                     benchmarkData.recordElementStats(allStyleElems);
                 }

trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java

@@ -61 +61 @@
      */
     public static void validateXML(Reader in) throws IOException, SAXException {
-        try (InputStream xsdStream = new CachedFile("resource://data/preferences.xsd").getInputStream()) {
+        try (CachedFile cf = new CachedFile("resource://data/preferences.xsd"); InputStream xsdStream = cf.getInputStream()) {
             Schema schema = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI).newSchema(new StreamSource(xsdStream));
             Validator validator = schema.newValidator();