set poll in progress from single caller at a time

haveno-dex · Oct 16, 2024 · c9e83b5 · c9e83b5
1 parent 54bccf7
commit c9e83b5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/core/src/main/java/haveno/core/trade/Trade.java b/core/src/main/java/haveno/core/trade/Trade.java
@@ -2500,8 +2500,14 @@ private void pollWallet() {
     }
 
     private void doPollWallet() {
+
+        // skip if shut down started
         if (isShutDownStarted) return;
+
+        // set poll in progress
+        boolean pollInProgressSet = false;
         synchronized (pollLock) {
+            if (!pollInProgress) pollInProgressSet = true;
             pollInProgress = true;
         }
         try {
@@ -2628,8 +2634,10 @@ else if (hasFailedTx && isPayoutPublished()) {
                 }
             }
         } finally {
-            synchronized (pollLock) {
-                pollInProgress = false;
+            if (pollInProgressSet) {
+                synchronized (pollLock) {
+                    pollInProgress = false;
+                }
             }
             requestSaveWallet();
         }

diff --git a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
@@ -1837,10 +1837,16 @@ private void pollWallet() {
     }
 
     private void doPollWallet(boolean updateTxs) {
+
+        // skip if shut down started
+        if (isShutDownStarted) return;
+
+        // set poll in progress
+        boolean pollInProgressSet = false;
         synchronized (pollLock) {
+            if (!pollInProgress) pollInProgressSet = true;
             pollInProgress = true;
         }
-        if (isShutDownStarted) return;
         try {
 
             // skip if daemon not synced
@@ -1903,8 +1909,10 @@ else if (isWalletConnectedToDaemon()) {
                 //e.printStackTrace();
             }
         } finally {
-            synchronized (pollLock) {
-                pollInProgress = false;
+            if (pollInProgressSet) {
+                synchronized (pollLock) {
+                    pollInProgress = false;
+                }
             }
 
             // cache wallet info last