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

we don't need that after all

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-06-23 20:09:35 +02:00
parent 5eab8c67c4
commit 5623ff9471
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/main/java/com/usatiuk/dhfs/storage/files/conflicts/DirectoryConflictResolver.java
View File

@@ -39,7 +39,6 @@ public class DirectoryConflictResolver implements ConflictResolver {
var oursAsDir = (JObject<Directory>) ours;
oursAsDir.runWriteLockedMeta((a, b, c) -> {
// FIXME:
if (!ours.tryLocalResolve())
throw new NotImplementedException("Conflict but we don't have local copy for " + ours.getName());

2
server/src/main/java/com/usatiuk/dhfs/storage/files/conflicts/FileConflictResolver.java
View File

@@ -45,13 +45,11 @@ public class FileConflictResolver implements ConflictResolver {
.orElseThrow(() -> new NotImplementedException("Could not find parent directory for file " + oursAsFile.getName()));
_oursDir.runWriteLockedMeta((a, b, c) -> {
// FIXME:
if (!_oursDir.tryLocalResolve())
throw new NotImplementedException("Conflict but we don't have local copy for " + _oursDir.getName());
_oursDir.runWriteLocked((mD, oursDir, bumpDir) -> {
oursAsFile.runWriteLockedMeta((a2, b2, c2) -> {
// FIXME:
if (!ours.tryLocalResolve())
throw new NotImplementedException("Conflict but we don't have local copy for " + ours.getName());

3
server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObjectResolver.java
View File

@@ -65,7 +65,8 @@ public class JObjectResolver {
public void notifyWrite(JObject<?> self) {
self.assertRWLock();
jObjectWriteback.markDirty(self.getName(), self);
invalidationQueueService.pushInvalidationToAll(self.getName());
if (self.isResolved())
invalidationQueueService.pushInvalidationToAll(self.getName());
}
public void bumpVersionSelf(JObject<?> self) {