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-07-06 23:12:15 +02:00
parent 3fc3eb63ba
commit 2464285430
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,7 +219,8 @@ public class JObject<T extends JObjectData> implements Serializable, Comparable<
|| wasSeen != _metaPart.isSeen()
|| prevData != _dataPart.get())
notifyWriteMeta();
if (!Objects.equals(ver, _metaPart.getChangelog()))
if (!Objects.equals(ver, _metaPart.getChangelog())
|| prevData != _dataPart.get())
notifyWriteData();
verifyRefs();
return ret;

4
server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/SyncHandler.java
View File

@@ -113,7 +113,9 @@ public class SyncHandler {
found.externalResolution(SerializationHelper.deserialize(header.getPushedData()));
return false;
} else if (data == null && header.hasPushedData()) {
found.externalResolution(SerializationHelper.deserialize(header.getPushedData()));
found.tryResolve(JObject.ResolutionStrategy.LOCAL_ONLY);
if (found.getData() == null)
found.externalResolution(SerializationHelper.deserialize(header.getPushedData()));
}
assert Objects.equals(receivedTotalVer, md.getOurVersion());