Changeset 1035 in josm for trunk/src/org/openstreetmap

Timestamp:

2008-10-09T09:43:59+02:00 (16 years ago)

Author:

stoecker

Message:

workaround for Java SAX parser bug. Closes #1618. Thanks to h-a-l-9000 _ arcor.de

File:

• trunk/src/org/openstreetmap/josm/actions/OpenAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/OpenAction.java

@@ -7 +7 @@
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
+import java.io.InputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -88 +89 @@
                 if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(fn)) {
                         GpxReader r = null;
+                        InputStream is;
                         if (file.getName().endsWith(".gpx.gz")) {
-                                r = new GpxReader(new GZIPInputStream(new FileInputStream(file)), file.getAbsoluteFile().getParentFile());
+                                is = new GZIPInputStream(new FileInputStream(file));
                         } else {
-                                r = new GpxReader(new FileInputStream(file), file.getAbsoluteFile().getParentFile());
+                                is = new FileInputStream(file);
                         }
+                        // Workaround for SAX BOM bug
+                        // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6206835
+                        if(!((is.read()==0xef)&&(is.read()==0xbb)&&(is.read()==0xbf))) {
+                                is.close();
+                                if (file.getName().endsWith(".gpx.gz")) {
+                                        is = new GZIPInputStream(new FileInputStream(file));
+                                } else {
+                                        is = new FileInputStream(file);
+                                }
+                        }
+                        r = new GpxReader(is,file.getAbsoluteFile().getParentFile());
                         r.data.storageFile = file;
                         GpxLayer gpxLayer = new GpxLayer(r.data, fn);