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

Timestamp:

2016-01-11T19:07:11+01:00 (8 years ago)

Author:

simon04

Message:

see #8824 - Fail fast when initializing imagery entries while starting

Use a short HTTP connect timeout of 1s for fetching the entries

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• CachedFile.java (modified) (3 diffs)
• imagery/ImageryReader.java (modified) (4 diffs)

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

@@ -69 +69 @@
     protected CachingStrategy cachingStrategy;
 
+    private transient boolean fastFail;
     private transient HttpClient activeConnection;
     protected File cacheFile;
@@ -159 +160 @@
         this.httpHeaders.putAll(headers);
         return this;
+    }
+
+    /**
+     * Sets whether opening HTTP connections should fail fast, i.e., whether a
+     * {@link HttpClient#setConnectTimeout(int) low connect timeout} should be used.
+     * @param fastFail whether opening HTTP connections should fail fast
+     */
+    public void setFastFail(boolean fastFail) {
+        this.fastFail = fastFail;
     }
 
@@ -433 +443 @@
                     .setIfModifiedSince(ifModifiedSince == null ? 0L : ifModifiedSince)
                     .setHeaders(httpHeaders);
+            if (fastFail) {
+                activeConnection.setReadTimeout(1000);
+            }
             final HttpClient.Response con = activeConnection.connect();
             if (ifModifiedSince != null && con.getResponseCode() == HttpURLConnection.HTTP_NOT_MODIFIED) {

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.imagery.Shape;
 import org.openstreetmap.josm.io.CachedFile;
-import org.openstreetmap.josm.io.UTFInputStreamReader;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.Utils;
@@ -33 +33 @@
     private final String source;
     private transient CachedFile cachedFile;
+    private transient boolean fastFail;
 
     private enum State {
@@ -56 +57 @@
         try {
             cachedFile = new CachedFile(source);
+            cachedFile.setFastFail(fastFail);
             try (BufferedReader in = cachedFile
                     .setMaxAge(CachedFile.DAYS)
@@ -359 +361 @@
     }
 
+    /**
+     * Sets whether opening HTTP connections should fail fast, i.e., whether a
+     * {@link HttpClient#setConnectTimeout(int) low connect timeout} should be used.
+     * @param fastFail whether opening HTTP connections should fail fast
+     * @see CachedFile#setFastFail(boolean)
+     */
+    public void setFastFail(boolean fastFail) {
+        this.fastFail = fastFail;
+    }
+
     @Override
     public void close() throws IOException {