Changeset 1750 in josm for trunk/src/org/openstreetmap/josm/io/OsmApi.java

Timestamp:

2009-07-08T21:50:32+02:00 (15 years ago)

Author:

Gubaer

Message:

new: replaced global conflict list by conflict list per layer, similar to datasets

File:

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

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

@@ -330 +330 @@
             String diffresult = sendRequest("POST", "changeset/" + changeset.id + "/upload", diff);
             DiffResultReader.parseDiffResult(diffresult, list, processed, duv.getNewIdMap(), Main.pleaseWaitDlg);
+        } catch(OsmTransferException e) {
+            throw e;
         } catch(Exception e) {
             throw new OsmTransferException(e);
@@ -443 +445 @@
 
                 if (retCode != 200)
-                    throw new OsmApiException(retCode,errorHeader,responseBody.toString());
+                    throw new OsmApiException(retCode,errorHeader.trim(),responseBody.toString().trim());
 
                 return responseBody.toString();