Merge pull request #127 from Suwayomi/j21-executor-fix

Use try-with-resources for executorService
Suwayomi · Jun 13, 2024 · 1392d00 · 1392d00
2 parents 06aec98 + 8e3e4d0
commit 1392d00
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/frontend/themes/miku/styles.css b/src/main/frontend/themes/miku/styles.css
@@ -1,4 +1,3 @@
-@import "theme-editor.css";
 /*
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/main/java/online/hatsunemiku/tachideskvaadinui/view/SearchView.java b/src/main/java/online/hatsunemiku/tachideskvaadinui/view/SearchView.java
@@ -327,6 +327,12 @@ private Div createSearchResultDiv(Source source, List<Manga> mangaList) {
     return searchResult;
   }
 
+  /**
+   * Searches for manga in the specified sources
+   *
+   * @param query the search query
+   * @param langGroupedSources the sources grouped by language
+   */
   private void searchSources(String query, Map<String, List<Source>> langGroupedSources) {
     for (var langSet : langGroupedSources.entrySet()) {
 
@@ -348,9 +354,7 @@ private void searchSources(String query, Map<String, List<Source>> langGroupedSo
         searchTasks.add(runnable);
       }
 
-      // When upgrading to Java 21 put the executor in a try-with-resources block instead
-      var executor = Executors.newCachedThreadPool();
-      try {
+      try (var executor = Executors.newCachedThreadPool()) {
         executor.invokeAll(searchTasks);
         executor.shutdown();
       } catch (InterruptedException e) {