Changeset 13828 in josm for trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

Timestamp:

2018-05-24T23:53:37+02:00 (8 years ago)

Author:

wiktorn

Message:

Sonar fixes, javadocs.

See: #16249

File:

• trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (2 diffs)

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

@@ -24 +24 @@
 import javax.json.Json;
 import javax.json.JsonObject;
+import javax.json.JsonReader;
 import javax.json.stream.JsonCollectors;
 import javax.swing.ImageIcon;
@@ -556 +557 @@
         modTileFeatures = e.modTileFeatures;
         if (e.default_layers != null) {
-            defaultLayers = Json.createReader(new StringReader(e.default_layers)).
-                    readArray().
-                    stream().
-                    map(x -> DefaultLayer.fromJson((JsonObject) x, imageryType)).
-                    collect(Collectors.toList());
+            try (JsonReader jsonReader = Json.createReader(new StringReader(e.default_layers))) {
+                defaultLayers = jsonReader.
+                        readArray().
+                        stream().
+                        map(x -> DefaultLayer.fromJson((JsonObject) x, imageryType)).
+                        collect(Collectors.toList());
+            }
         }
         customHttpHeaders = e.customHttpHeaders;