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

Timestamp:

2018-09-22T12:38:49+02:00 (6 years ago)

Author:

wiktorn

Message:

Treat SocketTimeoutException as transient error.

Extend CacheEntryAttributes and allow storage of exception class name. Use this
information to treat SocketTimeoutException in TMS downloads as transient.

See: #16743

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• cache/CacheEntryAttributes.java (modified) (4 diffs)
• cache/JCSCachedTileLoaderJob.java (modified) (3 diffs)
• imagery/TMSCachedTileLoaderJob.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java

@@ -7 +7 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -29 +30 @@
     private static final String HTTP_RESPONSE_CODE = "httpResponseCode";
     private static final String ERROR_MESSAGE = "errorMessage";
+    private static final String EXCEPTION = "exception";
     // this contains all of the above
     private static final Set<String> RESERVED_KEYS = new HashSet<>(Arrays.asList(
@@ -36 +38 @@
         EXPIRATION_TIME,
         HTTP_RESPONSE_CODE,
-        ERROR_MESSAGE
+        ERROR_MESSAGE,
+        EXCEPTION
     ));
 
@@ -195 +198 @@
         attrs.put(ERROR_MESSAGE, message);
     }
+
+    /**
+     * @param e exception that caused error
+     *
+     */
+    public void setException(Exception e) {
+        attrs.put(EXCEPTION, e.getClass().getCanonicalName());
+    }
+
+    /**
+     * @return Optional exception that was thrown when fetching resource
+     *
+     */
+    public Optional<Class<? extends Exception>> getException() {
+        String className = attrs.get(EXCEPTION);
+        if (className == null) {
+            return Optional.empty();
+        }
+        try {
+            Class<?> klass = Class.forName(className);
+            if (Exception.class.isAssignableFrom(klass)) {
+                return Optional.of(klass.asSubclass(Exception.class));
+            }
+        } catch (ClassNotFoundException | ClassCastException ex) {
+            // NOOP
+        }
+        return Optional.empty();
+    }
 }

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -392 +392 @@
             attributes.setResponseCode(404);
             attributes.setError(e);
+            attributes.setException(e);
             boolean doCache = isResponseLoadable(null, 404, null) || cacheAsEmpty();
             if (doCache) {
@@ -404 +405 @@
             } else {
                 attributes.setError(e);
+                attributes.setException(e);
                 attributes.setResponseCode(599); // set dummy error code, greater than 500 so it will be not cached
                 return false;
@@ -410 +412 @@
         } catch (InterruptedException e) {
             attributes.setError(e);
+            attributes.setException(e);
             Logging.logWithStackTrace(Logging.LEVEL_WARN, e, "JCS - Exception during download {0}", getUrlNoException());
             Thread.currentThread().interrupt();

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -6 +6 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -226 +227 @@
                 tile.setLoaded(false); // treat 500 errors as temporary and try to load it again
             }
+            // treat SocketTimeoutException as transient error
+            attributes.getException()
+            .filter(x -> x.isAssignableFrom(SocketTimeoutException.class))
+            .ifPresent(x -> tile.setLoaded(false));
         } else {
             tile.setError(tr("Problem loading tile"));