Changeset 9228 in josm for trunk

Timestamp:

2015-12-31T10:37:05+01:00 (8 years ago)

Author:

wiktorn

Message:

Do not use cache when downloading.

This avoids getting objects from Java Web Start Cache, though it will
also skip any tile cache in between, which may result in bigger load of
tile servers.

See #12235

File:

• trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (modified) (5 diffs)

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

@@ -311 +311 @@
             }
 
-            HttpURLConnection urlConn = getURLConnection(getUrl());
+            HttpURLConnection urlConn = getURLConnection(getUrl(), true);
 
             if (isObjectLoadable()  &&
@@ -326 +326 @@
             for (int i = 0; i < 5; i++) {
                 if (urlConn.getResponseCode() == 302) {
-                    urlConn = getURLConnection(new URL(urlConn.getHeaderField("Location")));
+                    urlConn = getURLConnection(new URL(urlConn.getHeaderField("Location")), true);
                 } else {
                     break;
@@ -470 +470 @@
     }
 
-    private HttpURLConnection getURLConnection(URL url) throws IOException {
+    private HttpURLConnection getURLConnection(URL url, boolean noCache) throws IOException {
         HttpURLConnection urlConn = (HttpURLConnection) url.openConnection();
         urlConn.setRequestProperty("Accept", "text/html, image/png, image/jpeg, image/gif, */*");
@@ -481 +481 @@
         }
 
-        if (force) {
+        if (force || noCache) {
             urlConn.setUseCaches(false);
         }
@@ -488 +488 @@
 
     private boolean isCacheValidUsingHead() throws IOException {
-        HttpURLConnection urlConn = getURLConnection(getUrl());
+        HttpURLConnection urlConn = getURLConnection(getUrl(), false);
         urlConn.setRequestMethod("HEAD");
         for (int i = 0; i < 5; i++) {
             if (urlConn.getResponseCode() == 302) {
-                urlConn = getURLConnection(new URL(urlConn.getHeaderField("Location")));
+                urlConn = getURLConnection(new URL(urlConn.getHeaderField("Location")), false);
             } else {
                 break;