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

some fixes

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-08-14 21:24:59 +02:00
parent b3f6327ed9
commit add4f134e3
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dhfs-parent/kleppmanntree/src/main/java/com/usatiuk/kleppmanntree/KleppmannTree.java
View File

@@ -171,7 +171,8 @@ public class KleppmannTree<TimestampT extends Comparable<TimestampT>, PeerIdT ex
var node = _storage.getById(n);
node.rwLock();
try {
trash.getNode().getChildren().remove(node.getNode().getMeta().getName());
if (trash.getNode().getChildren().remove(n.toString()) == null)
LOGGER.severe("Node " + node.getNode().getId() + " not found in trash but should be there");
node.notifyRmRef(trash.getNode().getId());
} finally {
node.rwUnlock();
@@ -369,6 +370,9 @@ public class KleppmannTree<TimestampT extends Comparable<TimestampT>, PeerIdT ex
}
newParentNode.getNode().getChildren().put(effect.newMeta().getName(), effect.childId());
if (effect.newParentId().equals(_storage.getTrashId()) &&
!Objects.equals(effect.newMeta().getName(), effect.childId()))
throw new IllegalArgumentException("Move to trash should have id of node as name");
node.getNode().setParent(effect.newParentId());
node.getNode().setMeta(effect.newMeta());
node.getNode().setLastEffectiveOp(effect.effectiveOp());

2
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jkleppmanntree/JKleppmannTree.java
View File

@@ -60,7 +60,7 @@ public class JKleppmannTree implements OpObject {
}
public void trash(JKleppmannTreeNodeMeta newMeta, String node) {
_tree.move(_storageInterface.getTrashId(), newMeta, node);
_tree.move(_storageInterface.getTrashId(), newMeta.withName(node), node);
}
@Override