Avoid piling up FileListener during GC

This short-cuts getting the URIs for Collected files. DarcBasicTest.testCollectBlobs ensures result is unchanged.
ecki · May 24, 2024 · 3446144 · 3446144
1 parent dc90645
commit 3446144
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 14 deletions.
diff --git a/...gestarc/src/main/java/com/seeburger/vfs2/provider/digestarc/DarcFileCollectOperation.java b/...gestarc/src/main/java/com/seeburger/vfs2/provider/digestarc/DarcFileCollectOperation.java
@@ -48,25 +48,26 @@ public DarcFileCollectOperation(FileObject root)
     public void process()
         throws FileSystemException
     {
-        if (root instanceof DarcFileObject)
+        if (!(root instanceof DarcFileObject))
         {
-            DarcFileObject darcFile = (DarcFileObject) root;
-            FileObject delegateFile = darcFile.getDelegateFile();
+            return;
+        }
 
-            filesList.add(delegateFile.getName().getURI());
+        final DarcFileObject darcFile = (DarcFileObject) root;
+        final String uri = darcFile.getDelegateURI();
+        filesList.add(uri);
 
-            if (darcFile.getType() == FileType.FOLDER)
+        if (darcFile.getType() == FileType.FOLDER)
+        {
+            FileObject[] fileList = darcFile.getChildren();
+            for (FileObject nextFile : fileList)
             {
-                FileObject[] fileList = darcFile.getChildren();
-                for (FileObject nextFile : fileList)
+                FileOperations fileOperations = nextFile.getFileOperations();
+                CollectFilesOperation operation = (CollectFilesOperation) fileOperations.getOperation(CollectFilesOperation.class);
+                if (operation != null)
                 {
-                    FileOperations fileOperations = nextFile.getFileOperations();
-                    CollectFilesOperation operation = (CollectFilesOperation) fileOperations.getOperation(CollectFilesOperation.class);
-                    if (operation != null)
-                    {
-                        operation.setFilesList(filesList);
-                        operation.process();
-                    }
+                    operation.setFilesList(filesList);
+                    operation.process();
                 }
             }
         }

diff --git a/...rovider-digestarc/src/main/java/com/seeburger/vfs2/provider/digestarc/DarcFileObject.java b/...rovider-digestarc/src/main/java/com/seeburger/vfs2/provider/digestarc/DarcFileObject.java
@@ -372,6 +372,28 @@ public void fileChanged(FileChangeEvent event)
         }
     }
 
+
+    /**
+     * Used by DarcFileCollectOperation to get URI of delegate.
+     * <P>
+     * This is done to avoid listener registration in {@link #getDelegateFile()}.
+     *
+     * @throws FileSystemException if lower level miss-behaves
+     */
+    protected String getDelegateURI() throws FileSystemException
+    {
+        Entry entry = getEntry();
+        String hash = entry.getHash();
+        FileObject targetFile = getProvider().resolveFileHash(hash);
+        if (targetFile != null)
+        {
+            /* we could refresh target here */
+            return targetFile.getName().getURI();
+        }
+        throw new FileSystemException("Expected file blob with hash=" + hash + " cannot be resolved");
+    }
+
+
     private BlobStorageProvider getProvider()
     {
         return ((DarcFileSystem)getFileSystem()).getBlobProvider();