Changeset 9414 in josm for trunk/src/org/openstreetmap/josm/data/imagery

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

File:

• trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (modified) (5 diffs)

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

@@ -63 +63 @@
     }
 
-    public void load() {
+    /**
+     * Loads the custom as well as default imagery entries.
+     * @param fastFail whether opening HTTP connections should fail fast, see {@link ImageryReader#setFastFail(boolean)}
+     */
+     public void load(boolean fastFail) {
         clear();
         List<ImageryPreferenceEntry> entries = Main.pref.getListOfStructs("imagery.entries", null, ImageryPreferenceEntry.class);
@@ -77 +81 @@
             Collections.sort(layers);
         }
-        loadDefaults(false, true);
+        loadDefaults(false, true, fastFail);
     }
 
@@ -89 +93 @@
      * @param clearCache if true, clear the cache and start a fresh download.
      * @param quiet whether not the loading should be performed using a {@link PleaseWaitRunnable} in the background
-     */
-    public void loadDefaults(boolean clearCache, boolean quiet) {
-        final DefaultEntryLoader loader = new DefaultEntryLoader(clearCache);
+     * @param fastFail whether opening HTTP connections should fail fast, see {@link ImageryReader#setFastFail(boolean)}
+     */
+    public void loadDefaults(boolean clearCache, boolean quiet, boolean fastFail) {
+        final DefaultEntryLoader loader = new DefaultEntryLoader(clearCache, fastFail);
         if (quiet) {
             loader.realRun();
             loader.finish();
         } else {
-            Main.worker.execute(new DefaultEntryLoader(clearCache));
+            Main.worker.execute(new DefaultEntryLoader(clearCache, fastFail));
         }
     }
@@ -106 +111 @@
 
         private final boolean clearCache;
+        private final boolean fastFail;
         private final List<ImageryInfo> newLayers = new ArrayList<>();
         private transient ImageryReader reader;
         private transient boolean canceled;
 
-        DefaultEntryLoader(boolean clearCache) {
+        DefaultEntryLoader(boolean clearCache, boolean fastFail) {
             super(tr("Update default entries"));
             this.clearCache = clearCache;
+            this.fastFail = fastFail;
         }
 
@@ -144 +151 @@
             try {
                 reader = new ImageryReader(source);
+                reader.setFastFail(fastFail);
                 Collection<ImageryInfo> result = reader.parse();
                 newLayers.addAll(result);