Merge pull request #5219 from jmacxx/fix_issue_5210

Fix initialization ordering issue
bisq-network · Feb 24, 2021 · 7ffb1bc · 7ffb1bc
2 parents dc38117 + d3b62b1
commit 7ffb1bc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/core/src/main/java/bisq/core/app/DomainInitialisation.java b/core/src/main/java/bisq/core/app/DomainInitialisation.java
@@ -196,12 +196,12 @@ public void initDomainServices(Consumer<String> rejectedTxErrorMessageHandler,
 
         tradeLimits.onAllServicesInitialized();
 
+        tradeManager.onAllServicesInitialized();
         arbitrationManager.onAllServicesInitialized();
         mediationManager.onAllServicesInitialized();
         refundManager.onAllServicesInitialized();
         traderChatManager.onAllServicesInitialized();
 
-        tradeManager.onAllServicesInitialized();
         closedTradableManager.onAllServicesInitialized();
         failedTradesManager.onAllServicesInitialized();
         xmrTxProofService.onAllServicesInitialized();

diff --git a/core/src/main/java/bisq/core/support/traderchat/TraderChatManager.java b/core/src/main/java/bisq/core/support/traderchat/TraderChatManager.java
@@ -139,6 +139,11 @@ protected AckMessageSourceType getAckMessageSourceType() {
     // API
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    public void onAllServicesInitialized() {
+        super.onAllServicesInitialized();
+        tryApplyMessages();
+    }
+
     public void onSupportMessage(SupportMessage message) {
         if (canProcessMessage(message)) {
             log.info("Received {} with tradeId {} and uid {}",

diff --git a/p2p/src/main/java/bisq/network/p2p/P2PService.java b/p2p/src/main/java/bisq/network/p2p/P2PService.java
@@ -334,13 +334,12 @@ private void applyIsBootstrapped(Consumer<P2PServiceListener> listenerHandler) {
 
             p2PDataStorage.onBootstrapped();
 
-            // We don't use a listener at mailboxMessageService as we require the correct
-            // order of execution. The p2pServiceListeners must be called after
-            // mailboxMessageService.onUpdatedDataReceived.
-            mailboxMessageService.onBootstrapped();
-
             // Once we have applied the state in the P2P domain we notify our listeners
             p2pServiceListeners.forEach(listenerHandler);
+
+            // We don't use a listener at mailboxMessageService as we require the correct
+            // order of execution. The p2pServiceListeners must be called before.
+            mailboxMessageService.onBootstrapped();
         }
     }