修复 FetchTask 未捕获部分异常的问题 (#5144)

Author: Glavo

HMCLCore/src/main/java/org/jackhuang/hmcl/task/FetchTask.java

@@ -185,7 +185,7 @@ private void downloadHttp(URI uri, boolean checkETag) throws DownloadException,
             }
         }
 
-        ArrayList<IOException> exceptions = null;
+        ArrayList<Exception> exceptions = null;
 
         // If loading the cache fails, the cache should not be loaded again.
         boolean useCachedResult = true;
@@ -284,10 +284,12 @@ private void downloadHttp(URI uri, boolean checkETag) throws DownloadException,
                         contentLength,
                         contentEncoding);
                 return;
+            } catch (InterruptedException e) {
+                throw e;
             } catch (FileNotFoundException ex) {
                 LOG.warning("Failed to download " + uri + ", not found" + (redirects == null ? "" : ", redirects: " + redirects), ex);
                 throw toDownloadException(uri, ex, exceptions); // we will not try this URL again
-            } catch (IOException ex) {
+            } catch (Exception ex) {
                 if (exceptions == null)
                     exceptions = new ArrayList<>();
 
@@ -301,7 +303,7 @@ private void downloadHttp(URI uri, boolean checkETag) throws DownloadException,
     }
 
     private void downloadNotHttp(URI uri) throws DownloadException, InterruptedException {
-        ArrayList<IOException> exceptions = null;
+        ArrayList<Exception> exceptions = null;
         for (int retryTime = 0; retryTime < retry; retryTime++) {
             if (isCancelled()) {
                 throw new InterruptedException();
@@ -317,11 +319,13 @@ private void downloadNotHttp(URI uri) throws DownloadException, InterruptedExcep
                         conn.getContentLengthLong(),
                         ContentEncoding.fromConnection(conn));
                 return;
+            } catch (InterruptedException e) {
+                throw e;
             } catch (FileNotFoundException ex) {
                 LOG.warning("Failed to download " + uri + ", not found", ex);
 
                 throw toDownloadException(uri, ex, exceptions); // we will not try this URL again
-            } catch (IOException ex) {
+            } catch (Exception ex) {
                 if (exceptions == null)
                     exceptions = new ArrayList<>();
 
@@ -333,7 +337,7 @@ private void downloadNotHttp(URI uri) throws DownloadException, InterruptedExcep
         throw toDownloadException(uri, null, exceptions);
     }
 
-    private static DownloadException toDownloadException(URI uri, @Nullable IOException last, @Nullable ArrayList<IOException> exceptions) {
+    private static DownloadException toDownloadException(URI uri, @Nullable Exception last, @Nullable ArrayList<Exception> exceptions) {
         if (exceptions == null || exceptions.isEmpty()) {
             return new DownloadException(uri, last != null
                     ? last
@@ -342,7 +346,7 @@ private static DownloadException toDownloadException(URI uri, @Nullable IOExcept
             if (last == null)
                 last = exceptions.remove(exceptions.size() - 1);
 
-            for (IOException e : exceptions) {
+            for (Exception e : exceptions) {
                 last.addSuppressed(e);
             }
             return new DownloadException(uri, last);