Do not close changeset after "cancelled upload"

[chriscf]

A transient fault in the connection can result in a CancelledUploadException, which leaves the upload incomplete, and if marked for closure the changeset is closed. In such a situation, it probably shouldn't be closed until the upload completes successfully.

POST http://www.openstreetmap.org/api/0.6/changeset/xxxxxxx/upload... Proxy Error
Waiting 10 seconds ... org.openstreetmap.josm.io.OsmTransferCancelledException
        at org.openstreetmap.josm.io.OsmApi.sleepAndListen(OsmApi.java:484)
        at org.openstreetmap.josm.io.OsmApi.sendRequest(OsmApi.java:569)
        at org.openstreetmap.josm.io.OsmApi.sendRequest(OsmApi.java:508)
        at org.openstreetmap.josm.io.OsmApi.uploadDiff(OsmApi.java:458)
        at org.openstreetmap.josm.io.OsmServerWriter.uploadChangesInChunks(OsmServerWriter.java:163)
        at org.openstreetmap.josm.io.OsmServerWriter.uploadOsm(OsmServerWriter.java:205)
        at org.openstreetmap.josm.gui.io.UploadPrimitivesTask.realRun(UploadPrimitivesTask.java:236)
        at org.openstreetmap.josm.gui.PleaseWaitRunnable.doRealRun(PleaseWaitRunnable.java:83)
        at org.openstreetmap.josm.gui.PleaseWaitRunnable.run(PleaseWaitRunnable.java:129)
        at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(Unknown Source)
        at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
        at java.lang.Thread.run(Unknown Source)
PUT http://www.openstreetmap.org/api/0.6/changeset/7529595/close... OK

[simon04]

No longer reproducible with r9514

What I tested:

1. Get hold of an open changeset
2. Add 100's of ways (to have some time to cancel)
3. Upload
4. Cancel soon
5. The console shows

   INFO: POST http://api06.dev.openstreetmap.org/api/0.6/changeset/70175/upload (10.3 kB) ...
   INFO: POST http://api06.dev.openstreetmap.org/api/0.6/changeset/70175/upload -> !!!
   INFO: Ignoring caught exception because upload is canceled. Exception is: org.openstreetmap.josm.io.OsmTransferException: java.net.SocketException: Socket closed
   

6. The changeset is still open