Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 4853)
+++ trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 4854)
@@ -560,5 +560,5 @@
     private String sendRequest(String requestMethod, String urlSuffix,String requestBody, ProgressMonitor monitor, boolean doAuthenticate, boolean fastFail) throws OsmTransferException {
         StringBuffer responseBody = new StringBuffer();
-        int retries = getMaxRetries();
+        int retries = fastFail ? 0 : getMaxRetries();
 
         while(true) { // the retry loop
@@ -568,4 +568,5 @@
                 activeConnection = (HttpURLConnection)url.openConnection();
                 activeConnection.setConnectTimeout(fastFail ? 1000 : Main.pref.getInteger("socket.timeout.connect",15)*1000);
+                activeConnection.setReadTimeout(fastFail ? 1000 : Main.pref.getInteger("socket.timeout.read",15)*1000);
                 activeConnection.setRequestMethod(requestMethod);
                 if (doAuthenticate) {