Changeset 2222 in josm for trunk/src/org

Timestamp:

2009-10-02T21:15:44+02:00 (15 years ago)

Author:

stoecker

Message:

fixed #3580 - patch by bastiK - no longer send username/password for capabilities GET request

File:

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

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

@@ -163 +163 @@
         initAuthentication();
         try {
-            String s = sendRequest("GET", "capabilities", null,monitor);
+            String s = sendRequest("GET", "capabilities", null,monitor, false);
             InputSource inputSource = new InputSource(new StringReader(s));
             SAXParserFactory.newInstance().newSAXParser().parse(inputSource, new CapabilitiesParser());
@@ -459 +459 @@
     }
 
+    private String sendRequest(String requestMethod, String urlSuffix,String requestBody, ProgressMonitor monitor) throws OsmTransferException {
+        return sendRequest(requestMethod, urlSuffix, requestBody, monitor, true);
+    }
+
     /**
      * Generic method for sending requests to the OSM API.
@@ -474 +478 @@
      *    been exhausted), or rewrapping a Java exception.
      */
-    private String sendRequest(String requestMethod, String urlSuffix,String requestBody, ProgressMonitor monitor) throws OsmTransferException {
+    private String sendRequest(String requestMethod, String urlSuffix,String requestBody, ProgressMonitor monitor, boolean doAuthenticate) throws OsmTransferException {
         StringBuffer responseBody = new StringBuffer();
-
         int retries = getMaxRetries();
 
@@ -486 +489 @@
                 activeConnection.setConnectTimeout(15000);
                 activeConnection.setRequestMethod(requestMethod);
-                addAuth(activeConnection);
+                if (doAuthenticate) {
+                    addAuth(activeConnection);
+                }
 
                 if (requestMethod.equals("PUT") || requestMethod.equals("POST") || requestMethod.equals("DELETE")) {