Changeset 14536 in josm for trunk

Timestamp:

2018-12-09T20:45:03+01:00 (5 years ago)

Author:

Don-vip

Message:

see #16073 - check response contents with correct cache

File:

• trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -10 +10 @@
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
@@ -69 +67 @@
 
     private final Map<String, Map<ImageryInfo, List<String>>> errors = Collections.synchronizedMap(new TreeMap<>());
-    private final Set<String> workingURLs = Collections.synchronizedSet(new HashSet<>());
+    private final Map<String, byte[]> workingURLs = Collections.synchronizedMap(new TreeMap<>());
 
     private TMSCachedTileLoaderJob helper;
@@ -92 +90 @@
 
     private byte[] checkUrl(ImageryInfo info, String url) {
-        if (url != null && !url.isEmpty() && !workingURLs.contains(url)) {
+        if (url != null && !url.isEmpty()) {
+            if (workingURLs.containsKey(url)) {
+                return workingURLs.get(url);
+            }
             try {
                 Response response = HttpClient.create(new URL(url))
@@ -103 +104 @@
                 } else if (response.getResponseCode() >= 300) {
                     Logging.warn(url + " -> HTTP " + response.getResponseCode());
-                } else {
-                    workingURLs.add(url);
                 }
                 try {
-                    return Utils.readBytesFromStream(response.getContent());
+                    byte[] data = Utils.readBytesFromStream(response.getContent());
+                    if (response.getResponseCode() < 300) {
+                        workingURLs.put(url, data);
+                    }
+                    return data;
                 } finally {
                     response.disconnect();