Changeset 3512 in josm

Timestamp:

2010-09-04T14:10:43+02:00 (14 years ago)

Author:

bastiK

Message:

fixed #5373 - JOSM can't delete old and replace by new plugins (JOSM loaded icons from plugin jar file, but did not release file handles.)

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (2 diffs)

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

@@ -143 +143 @@
             if(archive != null)
             {
+                ZipFile zipFile = null;
                 try
                 {
-                    ZipFile zipFile = new ZipFile(archive);
+                    zipFile = new ZipFile(archive);
                     ZipEntry entry = zipFile.getEntry(full_name);
                     if(entry != null)
@@ -152 +153 @@
                         int offs = 0;
                         byte[] buf = new byte[size];
-                        InputStream is = zipFile.getInputStream(entry);
-                        while(size > 0)
-                        {
-                            int l = is.read(buf, offs, size);
-                            offs += l;
-                            size -= l;
+                        InputStream is = null;
+                        try {
+                            is = zipFile.getInputStream(entry);
+                            while(size > 0)
+                            {
+                                int l = is.read(buf, offs, size);
+                                offs += l;
+                                size -= l;
+                            }
+                            img = Toolkit.getDefaultToolkit().createImage(buf);
+                        } finally {
+                            if (is != null) {
+                                is.close();
+                            }
                         }
-                        img = Toolkit.getDefaultToolkit().createImage(buf);
                     }
                 } catch (Exception e) {
                     System.err.println(tr("Warning: failed to handle zip file ''{0}''. Exception was: {1}", archive.getName(), e.toString()));
+                } finally {
+                    if (zipFile != null) {
+                        try {
+                            zipFile.close();
+                        } catch (IOException ex) {
+                        }
+                    }
                 }
             }