From 1b466eb33ff31bedfaac6736be046ed37e16d53d Mon Sep 17 00:00:00 2001
From: huanghongxun <huanghongxun2008@126.com>
Date: Tue, 4 Feb 2020 22:49:49 +0800
Subject: [PATCH] fix: recognizing CancellationException as crash

---
 .../src/main/java/org/jackhuang/hmcl/task/TaskExecutor.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskExecutor.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskExecutor.java
index 4db7dcb26..4366c1f25 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskExecutor.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskExecutor.java
@@ -108,6 +108,8 @@ public final class TaskExecutor {
             throw new IllegalStateException("Cannot cancel a not started TaskExecutor");
         }
 
+        Logging.LOG.log(Level.INFO, "Cancelling task " + firstTask);
+
         cancelled.set(true);
         future.cancel(true);
     }
@@ -132,9 +134,6 @@ public final class TaskExecutor {
                 .thenApplyAsync(unused -> (Exception) null)
                 .exceptionally(throwable -> {
                     Throwable resolved = resolveException(throwable);
-                    if (resolved instanceof CancellationException) {
-                        throw (CancellationException)resolved;
-                    }
                     if (resolved instanceof Exception) {
                         return (Exception) resolved;
                     } else {