stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-29 04:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix deleting

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-07-27 23:55:45 +02:00
parent 1de1ff672a
commit 18d775cf68
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectRefProcessor.java
View File

@@ -1,6 +1,5 @@
package com.usatiuk.dhfs.objects.jrepository;
import com.google.common.collect.Streams;
import com.usatiuk.dhfs.objects.repository.PersistentRemoteHostsService;
import com.usatiuk.dhfs.objects.repository.RemoteObjectServiceClient;
import com.usatiuk.dhfs.objects.repository.autosync.AutoSyncProcessor;
@@ -15,7 +14,6 @@ import org.eclipse.microprofile.config.inject.ConfigProperty;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Stream;
@ApplicationScoped
public class JObjectRefProcessor {
@@ -171,12 +169,14 @@ public class JObjectRefProcessor {
m.markDeleted();
Collection<String> extracted = null;
if (got.getData() != null) extracted = got.getData().extractRefs();
if (got.getData() != null)
extracted = got.getData().extractRefs();
Collection<String> saved = got.getMeta().getSavedRefs();
got.discardData();
if (got.getMeta().getSavedRefs() != null)
for (var r : got.getMeta().getSavedRefs()) deleteRef(got, r);
if (saved != null)
for (var r : saved) deleteRef(got, r);
if (extracted != null)
for (var r : extracted) deleteRef(got, r);

8
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectResolver.java
View File

@@ -150,12 +150,14 @@ public class JObjectResolver {
self.getMeta().markDeleted();
Collection<String> extracted = null;
if (self.getData() != null) extracted = self.getData().extractRefs();
if (self.getData() != null)
extracted = self.getData().extractRefs();
Collection<String> saved = self.getMeta().getSavedRefs();
self.discardData();
if (self.getMeta().getSavedRefs() != null)
for (var r : self.getMeta().getSavedRefs()) quickDeleteRef(self, r);
if (saved != null)
for (var r : saved) quickDeleteRef(self, r);
if (extracted != null)
for (var r : extracted) quickDeleteRef(self, r);
}