Changeset 9639 in josm

Timestamp:

2016-01-26T19:21:58+01:00 (9 years ago)

Author:

stoecker

Message:

fix possible resource leaks

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/projection/datum/NTV2GridShiftFileWrapper.java (modified) (1 diff)
• tools/FontsManager.java (modified) (1 diff)
• tools/RightAndLefthandTraffic.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java

@@ -52 +52 @@
     public NTV2GridShiftFile getShiftFile() {
         if (instance == null) {
-            try (InputStream is = new CachedFile(gridFileName).getInputStream()) {
+            try (CachedFile cf = new CachedFile(gridFileName); InputStream is = cf.getInputStream()) {
                 instance = new NTV2GridShiftFile();
                 instance.loadGridShiftFile(is, false);

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

@@ -38 +38 @@
         for (String fontFile : INCLUDED_FONTS) {
             String url = "resource://data/fonts/"+fontFile;
-            try (InputStream i = new CachedFile(url).getInputStream()) {
+            try (CachedFile cf = new CachedFile(url); InputStream i = cf.getInputStream()) {
                 ge.registerFont(Font.createFont(Font.TRUETYPE_FONT, i));
             } catch (IOException | FontFormatException ex) {

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

@@ -72 +72 @@
     private static void initialize() {
         leftHandTrafficPolygons = new ArrayList<>();
-        try (InputStream is = new CachedFile("resource://data/left-right-hand-traffic.osm").getInputStream()) {
+        try (CachedFile cf = new CachedFile("resource://data/left-right-hand-traffic.osm");
+                InputStream is = cf.getInputStream()) {
             DataSet data = OsmReader.parseDataSet(is, null);
             for (Way w : data.getWays()) {