Changeset 2825 in josm

Timestamp:

2010-01-12T08:58:43+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #4328: No visible error message when trying to upload to a closed changeset

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/io/UploadPrimitivesTask.java (modified) (1 diff)
• io/OsmApi.java (modified) (3 diffs)
• io/OsmServerWriter.java (modified) (3 diffs)

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

@@ -316 +316 @@
                 if (lastException instanceof ChangesetClosedException) {
                     ChangesetClosedException e = (ChangesetClosedException)lastException;
+                    if (e.getSource().equals(ChangesetClosedException.Source.UPDATE_CHANGESET)) {
+                        handleFailedUpload(lastException);
+                        return;
+                    }
                     if (strategy.getPolicy() == null)
                         /* do nothing if unknown policy */

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

@@ -22 +22 @@
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.logging.Logger;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -47 +48 @@
  */
 public class OsmApi extends OsmConnection {
+    static private final Logger logger = Logger.getLogger(OsmApi.class.getName());
     /** max number of retries to send a request in case of HTTP 500 errors or timeouts */
     static public final int DEFAULT_MAX_NUM_RETRIES = 5;
@@ -579 +581 @@
                 case HttpURLConnection.HTTP_GONE:
                     throw new OsmApiPrimitiveGoneException(errorHeader, errorBody);
-                    //                case HttpURLConnection.HTTP_UNAUTHORIZED:
-                    //                    throw new OsmApiException(retCode, errorHeader, errorBody);
-                    //                case HttpURLConnection.HTTP_PROXY_AUTH:
-                    //                    throw new OsmApiException(retCode, errorHeader, errorBody);
-                    //                case HttpURLConnection.HTTP_FORBIDDEN:
-                    //                    throw new OsmApiException(retCode, errorHeader, errorBody);
                 case HttpURLConnection.HTTP_CONFLICT:
                     if (ChangesetClosedException.errorHeaderMatchesPattern(errorHeader))

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

@@ -121 +121 @@
         } catch(OsmTransferException e) {
             throw e;
-        } catch(Exception e) {
-            throw new OsmTransferException(e);
         } finally {
             progressMonitor.finishTask();
@@ -161 +159 @@
         } catch(OsmTransferException e) {
             throw e;
-        } catch(Exception e) {
-            throw new OsmTransferException(e);
         } finally {
             progressMonitor.finishTask();
@@ -207 +203 @@
         } catch(OsmTransferException e) {
             throw e;
-        } catch(Exception e) {
-            throw new OsmTransferException(e);
         } finally {
             monitor.finishTask();