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

Timestamp:

2008-08-26T22:10:43+02:00 (16 years ago)

Author:

ramack

Message:

GpxWriter does not close the stream it writes to after it has finished, to allow writing to a network stream

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/GpxExportAction.java (modified) (1 diff)
• actions/SaveActionBase.java (modified) (1 diff)
• io/GpxWriter.java (modified) (1 diff)

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

@@ -129 +129 @@
                 // TODO: add copyright, etc.
                 try {
-                        new GpxWriter(new FileOutputStream(file)).write(gpxData);
+                        FileOutputStream fo = new FileOutputStream(file);
+                        new GpxWriter(fo).write(gpxData);
+                        fo.flush();
+                        fo.close();
                 } catch (IOException x) {
                         x.printStackTrace();

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

@@ -186 +186 @@
                                         copy(file, tmpFile);
                                 }
-
-                                new GpxWriter(new FileOutputStream(file)).write(layer.data);
+                                FileOutputStream fo = new FileOutputStream(file);
+                                new GpxWriter(fo).write(layer.data);
+                                fo.flush();
+                                fo.close();
+
                                 if (!Main.pref.getBoolean("save.keepbackup") && (tmpFile != null)) {
                                         tmpFile.delete();

trunk/src/org/openstreetmap/josm/io/GpxWriter.java

@@ -51 +51 @@
                 out.print("</gpx>");
                 out.flush();
-                out.close();
         }