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

Timestamp:

2009-11-19T13:30:09+01:00 (16 years ago)

Author:

Gubaer

Message:

fixed #3937: Closed changeset (due to timeout) remains in the upload dialog

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• ChangesetClosedException.java (added)
• OsmApi.java (modified) (2 diffs)
• OsmChangesetCloseException.java (deleted)

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

@@ -338 +338 @@
      * @throws OsmTransferException if something goes wrong.
      * @throws IllegalArgumentException if changeset is null
-     * @throws IllegalArgumentException if changeset.getId() == 0
+     * @throws IllegalArgumentException if changeset.getId() <= 0
      * 
      */
@@ -359 +359 @@
                     monitor
             );
+        } catch(OsmApiException e) {
+            if (e.getResponseCode() == HttpURLConnection.HTTP_CONFLICT)
+                throw new ChangesetClosedException(e.getErrorHeader());
+            throw e;
         } finally {
             monitor.finishTask();