Ticket #11548: HttpURL.2.patch

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

@@ -318 +318 @@
                 return true;
             }
 
-            HttpURLConnection urlConn = getURLConnection();
+            URLConnection urlConn = getURLConnection();
 
             if (isObjectLoadable()  &&
                     (now - attributes.getLastModification()) <= ABSOLUTE_EXPIRE_TIME_LIMIT) {
@@ -327 +327 @@
             if (isObjectLoadable() && attributes.getEtag() != null) {
                 urlConn.addRequestProperty("If-None-Match", attributes.getEtag());
             }
-            if (urlConn.getResponseCode() == 304) {
+            if (responseCode(urlConn) == 304) {
                 // If isModifiedSince or If-None-Match has been set
                 // and the server answers with a HTTP 304 = "Not Modified"
                 log.log(Level.FINE, "JCS - IfModifiedSince/Etag test: local version is up to date: {0}", getUrl());
@@ -348 +348 @@
             attributes = parseHeaders(urlConn);
 
             for (int i = 0; i < 5; ++i) {
-                if (urlConn.getResponseCode() == 503) {
+                if (responseCode(urlConn) == 503) {
                     Thread.sleep(5000+(new Random()).nextInt(5000));
                     continue;
                 }
 
-                attributes.setResponseCode(urlConn.getResponseCode());
+                attributes.setResponseCode(responseCode(urlConn));
                 byte[] raw = read(urlConn);
 
-                if (isResponseLoadable(urlConn.getHeaderFields(), urlConn.getResponseCode(), raw)) {
+                if (isResponseLoadable(urlConn.getHeaderFields(), responseCode(urlConn), raw)) {
                     // we need to check cacheEmpty, so for cases, when data is returned, but we want to store
                     // as empty (eg. empty tile images) to save some space
                     cacheData = createCacheEntry(raw);
@@ -447 +447 @@
         return ret;
     }
 
-    private HttpURLConnection getURLConnection() throws IOException {
-        HttpURLConnection urlConn = (HttpURLConnection) getUrl().openConnection();
+    private URLConnection getURLConnection() throws IOException {
+        URLConnection urlConn = getUrl().openConnection();
         urlConn.setRequestProperty("Accept", "text/html, image/png, image/jpeg, image/gif, */*");
         urlConn.setReadTimeout(readTimeout); // 30 seconds read timeout
         urlConn.setConnectTimeout(connectTimeout);
@@ -462 +462 @@
     }
 
     private boolean isCacheValidUsingHead() throws IOException {
-        HttpURLConnection urlConn = (HttpURLConnection) getUrl().openConnection();
-        urlConn.setRequestMethod("HEAD");
+        URLConnection urlConn = getUrl().openConnection();
+        if (urlConn instanceof HttpURLConnection) {
+            ((HttpURLConnection)urlConn).setRequestMethod("HEAD");
+        }
         long lastModified = urlConn.getLastModified();
         return (attributes.getEtag() != null && attributes.getEtag().equals(urlConn.getRequestProperty("ETag"))) ||
                (lastModified != 0 && lastModified <= attributes.getLastModification());
@@ -521 +523 @@
     public void handleJobCancellation() {
         finishLoading(LoadResult.CANCELED);
     }
+
+    private int responseCode(URLConnection urlConn) throws IOException {
+        if (urlConn instanceof HttpURLConnection) {
+            return ((HttpURLConnection) urlConn).getResponseCode();
+        } else {
+            return 500;
+        }
+    }
 }