From 0864e0a6710a37509ae23718446112c124af3288 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 15 Oct 2021 22:30:27 +0100 Subject: [PATCH] Ensure decompiler worker deamons are stopped after failure. --- .../fabricmc/loom/task/GenerateSourcesTask.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java b/src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java index 8c6dca2..ecd9ad8 100644 --- a/src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java +++ b/src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java @@ -148,13 +148,15 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask { params.getClassPath().setFrom(getProject().getConfigurations().getByName(Constants.Configurations.MINECRAFT_DEPENDENCIES)); }); - workQueue.await(); + try { + workQueue.await(); + } finally { + if (useProcessIsolation()) { + boolean stopped = WorkerDaemonClientsManagerHelper.stopIdleJVM(getWorkerDaemonClientsManager(), jvmMarkerValue); - if (useProcessIsolation()) { - boolean stopped = WorkerDaemonClientsManagerHelper.stopIdleJVM(getWorkerDaemonClientsManager(), jvmMarkerValue); - - if (!stopped) { - throw new RuntimeException("Failed to stop decompile worker JVM"); + if (!stopped) { + throw new RuntimeException("Failed to stop decompile worker JVM"); + } } } }