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

Timestamp:

2008-03-28T00:47:41+01:00 (16 years ago)

Author:

framm

Message:

• patch for classpath compatibility by Andreas Putzo <andreas@…>. Closes #663

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) (3 diffs)

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

@@ -27 +27 @@
 
 /**
- * Class that uploades all changes to the osm server.
+ * Class that uploads all changes to the osm server.
  *
  * This is done like this: - All objects with id = 0 are uploaded as new, except
@@ -41 +41 @@
 
         /**
-         * This list contain all sucessfull processed objects. The caller of
+         * This list contain all successful processed objects. The caller of
          * upload* has to check this after the call and update its dataset.
          *
-         * If a server connection error occours, this may contain fewer entries
+         * If a server connection error occurs, this may contain fewer entries
          * than where passed in the list to upload*.
          */
@@ -192 +192 @@
                         activeConnection.setConnectTimeout(15000);
                         activeConnection.setRequestMethod(requestMethod);
-                        if (addBody)
+            addAuth(activeConnection);
+                        if (addBody) {
                                 activeConnection.setDoOutput(true);
-                        activeConnection.connect();
-                        System.out.println("connected");
-                        if (addBody) {
                                 OutputStream out = activeConnection.getOutputStream();
                                 OsmWriter.output(out, new OsmWriter.Single(osm, true));
                                 out.close();
-                        }
+            }
+                        activeConnection.connect();
+                        System.out.println("connected");
 
                         int retCode = activeConnection.getResponseCode();