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 ba68d0ee7287b3da4963b0c38a6f7c0a7f196914 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Mon Jul 28 06:55:09 2025 -0400 Reduce vertical whitespace --- .../java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java index e58dd04d0..30a41dbf9 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java @@ -78,7 +78,6 @@ public class SoftRefFilesCache extends AbstractFilesCache { public synchronized void clear(final FileSystem fileSystem) { final Map<FileName, Reference<FileObject>> files = getOrCreateFilesystemCache(fileSystem); final Iterator<FileSystemAndNameKey> iterKeys = refReverseMap.values().iterator(); - while (iterKeys.hasNext()) { final FileSystemAndNameKey key = iterKeys.next(); if (key.getFileSystem() == fileSystem) { @@ -86,7 +85,6 @@ public class SoftRefFilesCache extends AbstractFilesCache { files.remove(key.getFileName()); } } - if (files.isEmpty()) { close(fileSystem); } @@ -107,7 +105,6 @@ public class SoftRefFilesCache extends AbstractFilesCache { if (log.isDebugEnabled()) { log.debug("Close FileSystem: " + fileSystem.getRootName().getFriendlyURI()); } - fileSystemCache.remove(fileSystem); if (fileSystemCache.isEmpty()) { endThread(); @@ -136,12 +133,10 @@ public class SoftRefFilesCache extends AbstractFilesCache { @Override public synchronized FileObject getFile(final FileSystem fileSystem, final FileName fileName) { final Map<FileName, Reference<FileObject>> files = getOrCreateFilesystemCache(fileSystem); - final Reference<FileObject> ref = files.get(fileName); if (ref == null) { return null; } - final FileObject fo = ref.get(); if (fo == null) { removeFile(fileSystem, fileName); @@ -175,13 +170,10 @@ public class SoftRefFilesCache extends AbstractFilesCache { if (log.isDebugEnabled()) { log.debug("putFile: " + this.getSafeName(fileObject)); } - synchronized (this) { final Map<FileName, Reference<FileObject>> files = getOrCreateFilesystemCache(fileObject.getFileSystem()); - final Reference<FileObject> ref = createReference(fileObject, refQueue); final FileSystemAndNameKey key = new FileSystemAndNameKey(fileObject.getFileSystem(), fileObject.getName()); - final Reference<FileObject> old = files.put(fileObject.getName(), ref); if (old != null) { refReverseMap.remove(old); @@ -195,13 +187,10 @@ public class SoftRefFilesCache extends AbstractFilesCache { if (log.isDebugEnabled()) { log.debug("putFile: " + this.getSafeName(fileObject)); } - synchronized (this) { final Map<FileName, Reference<FileObject>> files = getOrCreateFilesystemCache(fileObject.getFileSystem()); - final Reference<FileObject> ref = createReference(fileObject, refQueue); final FileSystemAndNameKey key = new FileSystemAndNameKey(fileObject.getFileSystem(), fileObject.getName()); - final Reference<FileObject> reference = files.get(fileObject.getName()); if (reference != null && reference.get() != null) { return false;