Changeset 9528 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2016-01-18T20:33:54+01:00 (9 years ago)

Author:

simon04

Message:

fix #11305 see #10306 - After canceling upload a new instead of the existing still open changeset is used on next upload

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) (2 diffs)

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

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.gui.JosmUserIdentityManager;
 import org.openstreetmap.josm.gui.io.UploadStrategySpecification;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
@@ -204 +205 @@
             if (changeset.getId() == 0) {
                 api.openChangeset(changeset, monitor.createSubTaskMonitor(0, false));
+                // update the user information
+                changeset.setUser(JosmUserIdentityManager.getInstance().asUser());
             } else {
                 api.updateChangeset(changeset, monitor.createSubTaskMonitor(0, false));