commit a19631a852cdef62533566c158788f1bd221fa50
author Gary Gregory <garydgregory@gmail.com> Thu Mar 11 10:12:56 2021 -0500
committer Gary Gregory <garydgregory@gmail.com> Thu Mar 11 10:12:56 2021 -0500
tree f9095efadbf3f603114ef912cd275c7dc8e78f9e
parent 38e3e89638e1d7f7fd27a388a2d14d509deebb28
parent e52c3106f6a69f6cdd9af5b15b00b712dfe1a8f3

Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-vfs

commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java

diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
index b47c256..75a28ae 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileSystemManager.java
@@ -555,6 +555,9 @@
         // collections with add()
         typeMap.clear();
 
+        // Close cache last.
+        closeComponent(filesCache);
+
         // should not happen, but make debugging easier:
         if (!components.isEmpty()) {
             log.warn("DefaultFilesystemManager.close: not all components are closed: " + components.toString());
@@ -567,11 +570,6 @@
         // virtual schemas
         virtualFileSystemSchemes.clear();
 
-        // Close cache last.
-        if (filesCache != null) {
-            filesCache.close();
-        }
-
         // setters and derived state
         defaultProvider = null;
         baseFile = null;