Merge pull request #4963 from chimp1984/fix-case-if-no-data-store-ser…

…vice-is-available Call completeHandler if services in store services is empty.
bisq-network · Dec 16, 2020 · 113bb4f · 113bb4f
2 parents 86d8176 + 4c57509
commit 113bb4f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java b/p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java
@@ -209,13 +209,6 @@ public void readFromResources(String postFix, Runnable completeHandler) {
         BooleanProperty protectedDataStoreServiceReady = new SimpleBooleanProperty();
         BooleanProperty resourceDataStoreServiceReady = new SimpleBooleanProperty();
 
-        appendOnlyDataStoreService.readFromResources(postFix, () -> appendOnlyDataStoreServiceReady.set(true));
-        protectedDataStoreService.readFromResources(postFix, () -> {
-            map.putAll(protectedDataStoreService.getMap());
-            protectedDataStoreServiceReady.set(true);
-        });
-        resourceDataStoreService.readFromResources(postFix, () -> resourceDataStoreServiceReady.set(true));
-
         readFromResourcesCompleteBinding = EasyBind.combine(appendOnlyDataStoreServiceReady,
                 protectedDataStoreServiceReady,
                 resourceDataStoreServiceReady,
@@ -225,6 +218,13 @@ public void readFromResources(String postFix, Runnable completeHandler) {
                 completeHandler.run();
             }
         });
+
+        appendOnlyDataStoreService.readFromResources(postFix, () -> appendOnlyDataStoreServiceReady.set(true));
+        protectedDataStoreService.readFromResources(postFix, () -> {
+            map.putAll(protectedDataStoreService.getMap());
+            protectedDataStoreServiceReady.set(true);
+        });
+        resourceDataStoreService.readFromResources(postFix, () -> resourceDataStoreServiceReady.set(true));
     }
 
     // Uses synchronous execution on the userThread. Only used by tests. The async methods should be used by app code.

diff --git a/p2p/src/main/java/bisq/network/p2p/storage/persistence/AppendOnlyDataStoreService.java b/p2p/src/main/java/bisq/network/p2p/storage/persistence/AppendOnlyDataStoreService.java
@@ -55,6 +55,10 @@ public void addService(MapStoreService<? extends PersistableNetworkPayloadStore<
     }
 
     public void readFromResources(String postFix, Runnable completeHandler) {
+        if (services.isEmpty()) {
+            completeHandler.run();
+            return;
+        }
         AtomicInteger remaining = new AtomicInteger(services.size());
         services.forEach(service -> {
             service.readFromResources(postFix, () -> {

diff --git a/p2p/src/main/java/bisq/network/p2p/storage/persistence/ProtectedDataStoreService.java b/p2p/src/main/java/bisq/network/p2p/storage/persistence/ProtectedDataStoreService.java
@@ -56,6 +56,10 @@ public void addService(MapStoreService<? extends PersistableEnvelope, ProtectedS
     }
 
     public void readFromResources(String postFix, Runnable completeHandler) {
+        if (services.isEmpty()) {
+            completeHandler.run();
+            return;
+        }
         AtomicInteger remaining = new AtomicInteger(services.size());
         services.forEach(service -> {
             service.readFromResources(postFix, () -> {

diff --git a/p2p/src/main/java/bisq/network/p2p/storage/persistence/ResourceDataStoreService.java b/p2p/src/main/java/bisq/network/p2p/storage/persistence/ResourceDataStoreService.java
@@ -46,6 +46,10 @@ public void addService(StoreService<? extends PersistableEnvelope> service) {
     }
 
     public void readFromResources(String postFix, Runnable completeHandler) {
+        if (services.isEmpty()) {
+            completeHandler.run();
+            return;
+        }
         AtomicInteger remaining = new AtomicInteger(services.size());
         services.forEach(service -> {
             service.readFromResources(postFix, () -> {