Changeset 29528 in osm for applications/viewer/jmapviewer/src

Timestamp:

2013-04-21T17:34:47+02:00 (12 years ago)

Author:

donvip

Message:

[jmapviewer] fix #josm8570 - streams not closed

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• OsmFileCacheTileLoader.java (modified) (1 diff)
• OsmTileLoader.java (modified) (1 diff)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java

@@ -304 +304 @@
         protected byte[] loadTileInBuffer(URLConnection urlConn) throws IOException {
             input = urlConn.getInputStream();
-            ByteArrayOutputStream bout = new ByteArrayOutputStream(input.available());
-            byte[] buffer = new byte[2048];
-            boolean finished = false;
-            do {
-                int read = input.read(buffer);
-                if (read >= 0) {
-                    bout.write(buffer, 0, read);
-                } else {
-                    finished = true;
-                }
-            } while (!finished);
-            if (bout.size() == 0)
-                return null;
-            return bout.toByteArray();
+            try {
+                ByteArrayOutputStream bout = new ByteArrayOutputStream(input.available());
+                byte[] buffer = new byte[2048];
+                boolean finished = false;
+                do {
+                    int read = input.read(buffer);
+                    if (read >= 0) {
+                        bout.write(buffer, 0, read);
+                    } else {
+                        finished = true;
+                    }
+                } while (!finished);
+                if (bout.size() == 0)
+                    return null;
+                return bout.toByteArray();
+            } finally {
+                input.close();
+                input = null;
+            }
         }
 

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java

@@ -58 +58 @@
                     } else {
                         input = conn.getInputStream();
-                        tile.loadImage(input);
-                        input.close();
-                        input = null;
+                        try {
+                            tile.loadImage(input);
+                        } finally { 
+                            input.close();
+                            input = null;
+                        }
                     }
                     tile.setLoaded(true);