From f15f88d23d7c7c1bd2336a38c0d5716c5f46f89a Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Mon, 26 Aug 2024 12:22:47 +0200 Subject: [PATCH] [GR-57584] Avoid using ThreadPoolExecutor#close since that's 19+ --- .../src/com/oracle/mxtool/checkcopy/CheckCopyright.java | 5 ++++- src/mx/_impl/mx.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/java/com.oracle.mxtool.checkcopy/src/com/oracle/mxtool/checkcopy/CheckCopyright.java b/java/com.oracle.mxtool.checkcopy/src/com/oracle/mxtool/checkcopy/CheckCopyright.java index da4e3498..7247725c 100644 --- a/java/com.oracle.mxtool.checkcopy/src/com/oracle/mxtool/checkcopy/CheckCopyright.java +++ b/java/com.oracle.mxtool.checkcopy/src/com/oracle/mxtool/checkcopy/CheckCopyright.java @@ -739,7 +739,8 @@ private static void processFiles(List fileNames) throws Exception { int threadCount = Runtime.getRuntime().availableProcessors(); - try (ThreadPoolExecutor threadPool = new ThreadPoolExecutor(threadCount, threadCount, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>())) { + ThreadPoolExecutor threadPool = new ThreadPoolExecutor(threadCount, threadCount, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>()); + try { List> tasks = new ArrayList<>(); for (String fileName : fileNames) { @@ -755,6 +756,8 @@ private static void processFiles(List fileNames) throws Exception { for (Future task : tasks) { task.get(); } + } finally { + threadPool.shutdown(); } } diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py index 85457e7e..34bf7e3f 100755 --- a/src/mx/_impl/mx.py +++ b/src/mx/_impl/mx.py @@ -18196,7 +18196,7 @@ def alarm_handler(signum, frame): _CACHE_DIR = get_env('MX_CACHE_DIR', join(dot_mx_dir(), 'cache')) # The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue -version = VersionSpec("7.29.4") # GR-57280 select_jdk sort order sometimes wrong +version = VersionSpec("7.29.5") # GR-57584 _mx_start_datetime = datetime.utcnow()