[commons-vfs] 05/06: Better use of the internal concurrent map.

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git

commit 87b52ac8cb68d101bc1c24d7587cb20a35e1a50a
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Nov 27 08:40:56 2021 -0500

    Better use of the internal concurrent map.
---
 .../apache/commons/vfs2/cache/LRUFilesCache.java    | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git 
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java 
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java
index 100611c..eecaefc 100644
--- 
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java
+++ 
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java
@@ -49,7 +49,7 @@ public class LRUFilesCache extends AbstractFilesCache {
     private static final Log log = LogFactory.getLog(LRUFilesCache.class);
 
     /** The FileSystem cache */
-    private final ConcurrentMap<FileSystem, Map<FileName, FileObject>> 
filesystemCache = new ConcurrentHashMap<>();
+    private final ConcurrentMap<FileSystem, Map<FileName, FileObject>> 
fileSystemCache = new ConcurrentHashMap<>();
 
     /** The size of the cache */
     private final int lruSize;
@@ -100,9 +100,9 @@ public class LRUFilesCache extends AbstractFilesCache {
                         VfsLog.warn(getLogger(), log, 
Messages.getString("vfs.impl/LRUFilesCache-remove-ex.warn"), e);
                     }
 
-                    final Map<?, ?> files = filesystemCache.get(filesystem);
+                    final Map<?, ?> files = fileSystemCache.get(filesystem);
                     if (files.isEmpty()) {
-                        filesystemCache.remove(filesystem);
+                        fileSystemCache.remove(filesystem);
                     }
 
                     return true;
@@ -180,25 +180,20 @@ public class LRUFilesCache extends AbstractFilesCache {
         try {
             files.clear();
 
-            filesystemCache.remove(filesystem);
+            fileSystemCache.remove(filesystem);
         } finally {
             writeLock.unlock();
         }
     }
 
-    protected Map<FileName, FileObject> getOrCreateFilesystemCache(final 
FileSystem filesystem) {
-        Map<FileName, FileObject> files = filesystemCache.get(filesystem);
-        if (files == null) {
-            files = new MyLRUMap(filesystem, lruSize);
-            filesystemCache.putIfAbsent(filesystem, files);
-        }
-        return files;
+    protected Map<FileName, FileObject> getOrCreateFilesystemCache(final 
FileSystem fileSystem) {
+        return fileSystemCache.computeIfAbsent(fileSystem, k -> new 
MyLRUMap(k, lruSize));
     }
 
     @Override
     public void close() {
         super.close();
-        filesystemCache.clear();
+        fileSystemCache.clear();
     }
 
     @Override
@@ -210,7 +205,7 @@ public class LRUFilesCache extends AbstractFilesCache {
             files.remove(name);
 
             if (files.isEmpty()) {
-                filesystemCache.remove(filesystem);
+                fileSystemCache.remove(filesystem);
             }
         } finally {
             writeLock.unlock();