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

real update fix

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-06-30 21:07:47 +02:00
parent 2d684dcebb
commit 3205e1575c
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,8 @@ import jakarta.enterprise.inject.Instance;
import jakarta.inject.Inject;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ApplicationScoped
public class SyncHandler {
@@ -83,10 +85,10 @@ public class SyncHandler {
boolean hasLower = false;
boolean hasHigher = false;
for (var e : md.getChangelog().entrySet()) {
if (receivedMap.getOrDefault(e.getKey(), 0L) < e.getValue())
for (var e : Stream.concat(md.getChangelog().keySet().stream(), receivedMap.keySet().stream()).collect(Collectors.toSet())) {
if (receivedMap.getOrDefault(e, 0L) < md.getChangelog().getOrDefault(e, 0L))
hasLower = true;
if (receivedMap.getOrDefault(e.getKey(), 0L) > e.getValue())
if (receivedMap.getOrDefault(e, 0L) > md.getChangelog().getOrDefault(e, 0L))
hasHigher = true;
}
@@ -121,9 +123,10 @@ public class SyncHandler {
return false;
}
if (hasLower)
if (hasLower) {
Log.warn("Unhandled update with lower version: " + header.getName() + " from " + from);
throw new OutdatedUpdateException();
}
Log.warn("No action on update: " + header.getName() + " from " + from);
return false;