From 4cf69921131d2d40402ad20c0d5dde73cf80ba2d Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Tue, 25 Apr 2023 19:04:43 -0400
Subject: [PATCH] shut down acquires trade lock until no delay so other threads
 can finish

---
 core/src/main/java/haveno/core/trade/Trade.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/haveno/core/trade/Trade.java b/core/src/main/java/haveno/core/trade/Trade.java
index e4a41cb6e2..1b8b859681 100644
--- a/core/src/main/java/haveno/core/trade/Trade.java
+++ b/core/src/main/java/haveno/core/trade/Trade.java
@@ -1148,9 +1148,15 @@ public abstract class Trade implements Tradable, Model {
     public void onShutDownStarted() {
         isShutDownStarted = true;
         if (wallet != null) log.info("{} {} preparing for shut down", getClass().getSimpleName(), getId());
-        synchronized (this) {
-            synchronized (walletLock) {
-                stopPolling(); // allow locks to release before stopping
+
+        // allow other threads to finish processing by acquiring trade locks until there's no delay
+        int maxAttempts = 10;
+        for (int i = 0; i < maxAttempts; i++) {
+            long startTimeMs = System.currentTimeMillis();
+            synchronized (this) {
+                synchronized (walletLock) {
+                    if (System.currentTimeMillis() - startTimeMs <= 10 || isShutDown) break;
+                }
             }
         }
     }