Changeset 8563 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-07-04T17:40:16+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #7813 - proper timeouts when connecting to OSM server (patch by anirud)

File:

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

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

@@ -135 +135 @@
                 throw new OsmTransferException(tr("Failed to open connection to API {0}.", url.toExternalForm()), e);
             }
+            Utils.setupURLConnection(activeConnection);
             if (cancel) {
                 activeConnection.disconnect();
@@ -148 +149 @@
                 activeConnection.setRequestProperty("Accept-Encoding", "gzip, deflate");
             }
-
-            activeConnection.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect", 15)*1000);
 
             try {