Changeset 30908 in osm for applications/editors/josm/plugins/opendata/src/org

Timestamp:

2015-01-11T21:50:45+01:00 (10 years ago)

Author:

donvip

Message:

[josm_opendata] update to GeoFLA 2.0, fix regression in 7z handling

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/SevenZipReader.java (modified) (4 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/SevenZipReader.java

@@ -33 +33 @@
 
     private final IInArchive archive = new Handler();
-
+    
     public SevenZipReader(InputStream in, AbstractDataSetHandler handler, boolean promptUser) throws IOException {
         super(handler, handler != null ? handler.getArchiveHandler() : null, promptUser);
@@ -41 +41 @@
             Utils.copyStream(in, out);
         }
-        try (IInStream random = new MyRandomAccessFile(tmpFile.getPath(), "r")) {
-            if (archive.Open(random) != 0) {
-                String message = "Unable to open 7z archive: "+tmpFile.getPath();
-                Main.warn(message);
-                if (!tmpFile.delete()) {
-                    tmpFile.deleteOnExit();
-                }
-                throw new IOException(message);
+        // random must be kept open for later extracting
+        @SuppressWarnings("resource")
+        IInStream random = new MyRandomAccessFile(tmpFile.getPath(), "r");
+        if (archive.Open(random) != 0) {
+            String message = "Unable to open 7z archive: "+tmpFile.getPath();
+            Main.warn(message);
+            random.close();
+            if (!tmpFile.delete()) {
+                tmpFile.deleteOnExit();
             }
+            throw new IOException(message);
         }
     }
-
-    public static DataSet parseDataSet(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance, boolean promptUser)
+    
+    public static DataSet parseDataSet(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance, boolean promptUser) 
             throws IOException, XMLStreamException, FactoryConfigurationError, JAXBException {
         return new SevenZipReader(in, handler, promptUser).parseDoc(instance);
     }
 
-    public static Map<File, DataSet> parseDataSets(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance, boolean promptUser)
+    public static Map<File, DataSet> parseDataSets(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance, boolean promptUser) 
             throws IOException, XMLStreamException, FactoryConfigurationError, JAXBException {
         return new SevenZipReader(in, handler, promptUser).parseDocs(instance);
@@ -68 +70 @@
     }
 
-    @Override protected void extractArchive(File temp, List<File> candidates) throws IOException, FileNotFoundException {
+    @Override
+    protected void extractArchive(File temp, List<File> candidates) throws IOException, FileNotFoundException {
         archive.Extract(null, -1, IInArchive.NExtract_NAskMode_kExtract, new ExtractCallback(archive, temp, candidates));
+        archive.close();
     }
-
+    
     private class ExtractCallback extends ArchiveExtractCallback {
         private final List<File> candidates;
-
+        
         public ExtractCallback(IInArchive archive, File tempDir, List<File> candidates) {
             Init(archive);
@@ -81 +85 @@
         }
 
-        @Override
+        @Override 
         public int GetStream(int index, OutputStream[] outStream, int askExtractMode) throws IOException {
             int res = super.GetStream(index, outStream, askExtractMode);