Changeset 12542 in josm for trunk/src/org/openstreetmap/josm/data/cache

Timestamp:

2017-07-30T17:07:42+02:00 (7 years ago)

Author:

Don-vip

Message:

partial revert of r12537

File:

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

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

@@ -81 +81 @@
 
 
-    private static final ConcurrentMap<String, Set<ICachedLoaderListener>> IN_PROGRESS = new ConcurrentHashMap<>();
-    private static final ConcurrentMap<String, Boolean> USE_HEAD = new ConcurrentHashMap<>();
+    private static final ConcurrentMap<String, Set<ICachedLoaderListener>> inProgress = new ConcurrentHashMap<>();
+    private static final ConcurrentMap<String, Boolean> useHead = new ConcurrentHashMap<>();
 
     protected final long now; // when the job started
@@ -162 +162 @@
             throw new IllegalArgumentException("No url returned");
         }
-        synchronized (IN_PROGRESS) {
-            Set<ICachedLoaderListener> newListeners = IN_PROGRESS.get(deduplicationKey);
+        synchronized (inProgress) {
+            Set<ICachedLoaderListener> newListeners = inProgress.get(deduplicationKey);
             if (newListeners == null) {
                 newListeners = new HashSet<>();
-                IN_PROGRESS.put(deduplicationKey, newListeners);
+                inProgress.put(deduplicationKey, newListeners);
                 first = true;
             }
@@ -259 +259 @@
     private void finishLoading(LoadResult result) {
         Set<ICachedLoaderListener> listeners;
-        synchronized (IN_PROGRESS) {
+        synchronized (inProgress) {
             try {
-                listeners = IN_PROGRESS.remove(getUrl().toString());
+                listeners = inProgress.remove(getUrl().toString());
             } catch (IOException e) {
                 listeners = null;
@@ -312 +312 @@
             // then just use HEAD request and check returned values
             if (isObjectLoadable() &&
-                    Boolean.TRUE.equals(USE_HEAD.get(getServerKey())) &&
+                    Boolean.TRUE.equals(useHead.get(getServerKey())) &&
                     isCacheValidUsingHead()) {
                 LOG.log(Level.FINE, "JCS - cache entry verified using HEAD request: {0}", getUrl());
@@ -346 +346 @@
                 LOG.log(Level.INFO, "JCS - Host: {0} found not to return 304 codes for If-Modified-Since or If-None-Match headers",
                         serverKey);
-                USE_HEAD.put(serverKey, Boolean.TRUE);
+                useHead.put(serverKey, Boolean.TRUE);
             }