Changeset 9528 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

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/gui/io/UploadPrimitivesTask.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
-import org.openstreetmap.josm.gui.JosmUserIdentityManager;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -295 +294 @@
                 }
             }
-            // update the user information
-            if (changeset.getUser() == null) {
-                changeset.setUser(JosmUserIdentityManager.getInstance().asUser());
-            }
             // if required close the changeset
             //
@@ -316 +311 @@
 
     @Override protected void finish() {
-        if (uploadCanceled)
-            return;
 
         // depending on the success of the upload operation and on the policy for
@@ -335 +328 @@
                     UploadDialog.getUploadDialog().setSelectedChangesetForNextUpload(changeset);
                 }
+                if (uploadCanceled) return;
                 if (lastException == null) {
                     new Notification(