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

Timestamp:

2020-01-20T23:18:38+01:00 (5 years ago)

Author:

simon04

Message:

fix #18588, see #12235 - Comply with OSM Tile Usage Policy

Do not send no-cache headers unless hitting JDK-8146450

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ShowStatusReportAction.java (modified) (2 diffs)
• data/cache/JCSCachedTileLoaderJob.java (modified) (3 diffs)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -71 +71 @@
     }
 
-    private static boolean isRunningJavaWebStart() {
-        try {
-            // See http://stackoverflow.com/a/16200769/2257172
-            return Class.forName("javax.jnlp.ServiceManager") != null;
-        } catch (ClassNotFoundException e) {
-            return false;
-        }
-    }
-
     /**
      * Replies the report header (software and system info)
@@ -129 +120 @@
             }
             // Add WebStart package details if run from JNLP
-            if (isRunningJavaWebStart()) {
+            if (Utils.isRunningJavaWebStart()) {
                 String webStartDetails = platform.getWebStartPackageDetails();
                 if (webStartDetails != null) {

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

@@ -302 +302 @@
 
             Logging.debug("JCS - starting HttpClient GET request for URL: {0}", getUrl());
-            final HttpClient request = getRequest("GET", true);
+            final HttpClient request = getRequest("GET");
 
             if (isObjectLoadable() &&
@@ -487 +487 @@
     }
 
-    private HttpClient getRequest(String requestMethod, boolean noCache) throws IOException {
+    private HttpClient getRequest(String requestMethod) throws IOException {
         final HttpClient urlConn = HttpClient.create(getUrl(), requestMethod);
         urlConn.setAccept("text/html, image/png, image/jpeg, image/gif, */*");
@@ -496 +496 @@
         }
 
-        if (force || noCache) {
-            urlConn.useCache(false);
-        }
+        final boolean noCache = force
+                // To remove when switching to Java 11
+                // Workaround for https://bugs.openjdk.java.net/browse/JDK-8146450
+                || (Utils.getJavaVersion() == 8 && Utils.isRunningJavaWebStart());
+        urlConn.useCache(!noCache);
+
         return urlConn;
     }
 
     private boolean isCacheValidUsingHead() throws IOException {
-        final HttpClient.Response urlConn = getRequest("HEAD", false).connect();
+        final HttpClient.Response urlConn = getRequest("HEAD").connect();
         long lastModified = urlConn.getLastModified();
         boolean ret = (attributes.getEtag() != null && attributes.getEtag().equals(urlConn.getHeaderField("ETag"))) ||

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -1801 +1801 @@
 
     /**
+     * Determines whether JOSM has been started via Java Web Start.
+     * @return true if JOSM has been started via Java Web Start
+     * @since 15740
+     */
+    public static boolean isRunningJavaWebStart() {
+        try {
+            // See http://stackoverflow.com/a/16200769/2257172
+            return Class.forName("javax.jnlp.ServiceManager") != null;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
+
+    /**
      * Get a function that converts an object to a singleton stream of a certain
      * class (or null if the object cannot be cast to that class).