ignore failure after task runner canceled

haveno-dex · May 17, 2024 · 76859f8 · 76859f8
1 parent 58cead6
commit 76859f8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/common/src/main/java/haveno/common/taskrunner/Task.java b/common/src/main/java/haveno/common/taskrunner/Task.java
@@ -74,6 +74,7 @@ protected void failed(Throwable t) {
 //        t.printStackTrace(pw);
 //        errorMessage = sw.toString();
 
+        if (taskHandler.isCanceled()) return;
         errorMessage = t.getMessage() + " (task " + getClass().getSimpleName() + ")";
         log.error(errorMessage, t);
         taskHandler.handleErrorMessage(errorMessage);

diff --git a/common/src/main/java/haveno/common/taskrunner/TaskRunner.java b/common/src/main/java/haveno/common/taskrunner/TaskRunner.java
@@ -80,11 +80,16 @@ public void cancel() {
         isCanceled = true;
     }
 
+    public boolean isCanceled() {
+        return isCanceled;
+    }
+
     void handleComplete() {
         next();
     }
 
     void handleErrorMessage(String errorMessage) {
+        if (isCanceled) return;
         log.error("Task failed: " + currentTask.getSimpleName() + " / errorMessage: " + errorMessage);
         failed = true;
         errorMessageHandler.handleErrorMessage(errorMessage);

diff --git a/core/src/main/java/haveno/core/offer/placeoffer/PlaceOfferProtocol.java b/core/src/main/java/haveno/core/offer/placeoffer/PlaceOfferProtocol.java
@@ -41,6 +41,7 @@ public class PlaceOfferProtocol {
     private Timer timeoutTimer;
     private final TransactionResultHandler resultHandler;
     private final ErrorMessageHandler errorMessageHandler;
+    private TaskRunner<PlaceOfferModel> taskRunner;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -65,7 +66,7 @@ public void placeOffer() {
 
         startTimeoutTimer();
 
-        TaskRunner<PlaceOfferModel> taskRunner = new TaskRunner<>(model,
+        taskRunner = new TaskRunner<>(model,
                 () -> {
 
                     // reset timer if response not yet received
@@ -145,6 +146,7 @@ private void stopTimeoutTimer() {
 
     private void handleError(String errorMessage) {
         if (timeoutTimer != null) {
+            taskRunner.cancel();
             log.error(errorMessage);
             stopTimeoutTimer();
             model.getOpenOffer().getOffer().setErrorMessage(errorMessage);