OO-4375 Fixed revision delete - remove metadata

src/main/java/org/olat/core/commons/services/vfs/ui/version/VFSTrashController.java

@@ -66,6 +66,7 @@ import org.olat.core.id.Identity;
 import org.olat.core.util.Formatter;
 import org.olat.core.util.Util;
 import org.olat.core.util.async.ProgressDelegate;
+import org.olat.core.util.vfs.VFSItem;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -209,6 +210,23 @@ public class VFSTrashController extends FormBasicController implements ProgressD
 		for(VersionsDeletedFileRow row:rowsToDelete) {
 			VFSRevision revision = vfsRepositoryService.getRevision(new VFSRevisionRefImpl(row.getRevisionKey()));
 			vfsRepositoryService.deleteRevisions(getIdentity(), Collections.singletonList(revision));
+			doDelete(revision);
+		}
+	}
+	
+	private void doDelete(VFSRevision revision) {
+		VFSMetadata metadata = revision.getMetadata();
+		vfsRepositoryService.deleteRevisions(getIdentity(), Collections.singletonList(revision));
+		dbInstance.commit();
+		
+		if(metadata.isDeleted()) {
+			List<VFSRevision> revisions = vfsRepositoryService.getRevisions(metadata);
+			if(revisions.isEmpty()) {
+				VFSItem item = vfsRepositoryService.getItemFor(metadata);
+				if(item == null || !item.exists()) {
+					vfsRepositoryService.deleteMetadata(metadata);
+				}
+			}
 		}
 	}