Changeset 763 in josm

Timestamp:

Aug 11, 2008 12:32:08 AM (5 years ago)

Author:

stoecker

Message:

Fix upload aborts. Closes #263. Patch by Florian Heer.

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmConnection.java (modified) (2 diffs)
• OsmServerWriter.java (modified) (1 diff)

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

@@ -128 +128 @@
                 cancel = true;
                 if (activeConnection != null) {
-                        activeConnection.setConnectTimeout(1);
-                        activeConnection.setReadTimeout(1);
+                        activeConnection.setConnectTimeout(100);
+                        activeConnection.setReadTimeout(100);
+                        try {
+                                Thread.sleep(100);
+                        } catch (InterruptedException ex) {}
                         activeConnection.disconnect();
                 }
@@ -135 +138 @@
 
         protected void addAuth(HttpURLConnection con) throws CharacterCodingException {
-            CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder();
-            String auth = Main.pref.get("osm-server.username") + ":" + Main.pref.get("osm-server.password");
-            ByteBuffer bytes = encoder.encode(CharBuffer.wrap(auth));
-            con.addRequestProperty("Authorization", "Basic "+Base64.encode(bytes));
-    }
+                CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder();
+                String auth = Main.pref.get("osm-server.username") + ":" + Main.pref.get("osm-server.password");
+                ByteBuffer bytes = encoder.encode(CharBuffer.wrap(auth));
+                con.addRequestProperty("Authorization", "Basic "+Base64.encode(bytes));
+        }
 }

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

@@ -55 +55 @@
          * Whether the operation should be aborted as soon as possible.
          */
-        private boolean cancel = false;
-        
+        // use the inherited variable
+        // private boolean cancel = false;
+
         /**
          * Object describing current changeset