Changeset 12542 in josm for trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

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/imagery/TMSCachedTileLoaderJob.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -51 +51 @@
     // we need another deduplication of Tile Loader listeners, as for each submit, new TMSCachedTileLoaderJob was created
     // that way, we reduce calls to tileLoadingFinished, and general CPU load due to surplus Map repaints
-    private static final ConcurrentMap<String, Set<TileLoaderListener>> IN_PROGRESS = new ConcurrentHashMap<>();
+    private static final ConcurrentMap<String, Set<TileLoaderListener>> inProgress = new ConcurrentHashMap<>();
 
     /**
@@ -71 +71 @@
         if (listener != null) {
             String deduplicationKey = getCacheKey();
-            synchronized (IN_PROGRESS) {
-                Set<TileLoaderListener> newListeners = IN_PROGRESS.get(deduplicationKey);
+            synchronized (inProgress) {
+                Set<TileLoaderListener> newListeners = inProgress.get(deduplicationKey);
                 if (newListeners == null) {
                     newListeners = new HashSet<>();
-                    IN_PROGRESS.put(deduplicationKey, newListeners);
+                    inProgress.put(deduplicationKey, newListeners);
                 }
                 newListeners.add(listener);
@@ -162 +162 @@
         this.attributes = attributes; // as we might get notification from other object than our selfs, pass attributes along
         Set<TileLoaderListener> listeners;
-        synchronized (IN_PROGRESS) {
-            listeners = IN_PROGRESS.remove(getCacheKey());
+        synchronized (inProgress) {
+            listeners = inProgress.remove(getCacheKey());
         }
         boolean status = result.equals(LoadResult.SUCCESS);