Changeset 15525 in josm for trunk

Timestamp:

2019-11-17T18:37:18+01:00 (4 years ago)

Author:

Don-vip

Message:

spotbugs - JLM_JSR166_UTILCONCURRENT_MONITORENTER

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• cache/HostLimitQueue.java (modified) (1 diff)
• cache/JCSCachedTileLoaderJob.java (modified) (2 diffs)
• imagery/TMSCachedTileLoaderJob.java (modified) (2 diffs)

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

@@ -130 +130 @@
         Semaphore limit = hostSemaphores.get(host);
         if (limit == null) {
-            synchronized (hostSemaphores) {
-                limit = hostSemaphores.computeIfAbsent(host, k -> new Semaphore(hostLimit));
-            }
+            limit = hostSemaphores.computeIfAbsent(host, k -> new Semaphore(hostLimit));
         }
         return limit;

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

@@ -153 +153 @@
             throw new IllegalArgumentException("No url returned");
         }
-        synchronized (inProgress) {
-            Set<ICachedLoaderListener> newListeners = inProgress.get(deduplicationKey);
-            if (newListeners == null) {
-                newListeners = new HashSet<>();
-                inProgress.put(deduplicationKey, newListeners);
-                first = true;
-            }
-            newListeners.add(listener);
-        }
+        synchronized (this) {
+            first = !inProgress.containsKey(deduplicationKey);
+        }
+        inProgress.computeIfAbsent(deduplicationKey, k -> new HashSet<>()).add(listener);
 
         if (first || force) {
@@ -250 +245 @@
     private void finishLoading(LoadResult result) {
         Set<ICachedLoaderListener> listeners;
-        synchronized (inProgress) {
-            try {
-                listeners = inProgress.remove(getUrl().toString());
-            } catch (IOException e) {
-                listeners = null;
-                Logging.trace(e);
-            }
+        try {
+            listeners = inProgress.remove(getUrl().toString());
+        } catch (IOException e) {
+            listeners = null;
+            Logging.trace(e);
         }
         if (listeners == null) {

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

@@ -76 +76 @@
         this.options = options;
         if (listener != null) {
-            String deduplicationKey = getCacheKey();
-            synchronized (inProgress) {
-                inProgress.computeIfAbsent(deduplicationKey, k -> new HashSet<>()).add(listener);
-            }
+            inProgress.computeIfAbsent(getCacheKey(), k -> new HashSet<>()).add(listener);
         }
     }
@@ -162 +159 @@
     public void loadingFinished(CacheEntry object, CacheEntryAttributes attributes, LoadResult result) {
         this.attributes = attributes; // as we might get notification from other object than our selfs, pass attributes along
-        Set<TileLoaderListener> listeners;
-        synchronized (inProgress) {
-            listeners = inProgress.remove(getCacheKey());
-        }
+        Set<TileLoaderListener> listeners = inProgress.remove(getCacheKey());
         boolean status = result == LoadResult.SUCCESS;