luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8269 from xuwei-k/try-with-resources 

use try-with-resources syntax in WorkerMain.java
This commit is contained in:
eugene yokota 2025-09-07 00:43:27 -04:00 committed by GitHub
parent f75241ff95 ee10ff7e23
commit 36f3dfbaaf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
worker/src/main/java/sbt/internal/worker1/WorkerMain.java
View File

@ -126,14 +126,11 @@ public final class WorkerMain {
throw new RuntimeException("missing jvmRunInfo element"); throw new RuntimeException("missing jvmRunInfo element");
} }
RunInfo.JvmRunInfo jvmRunInfo = info.jvmRunInfo; RunInfo.JvmRunInfo jvmRunInfo = info.jvmRunInfo;
URLClassLoader cl = createClassLoader(jvmRunInfo, ClassLoader.getSystemClassLoader()); try (URLClassLoader cl = createClassLoader(jvmRunInfo, ClassLoader.getSystemClassLoader())) {
try {
Class<?> mainClass = cl.loadClass(jvmRunInfo.mainClass); Class<?> mainClass = cl.loadClass(jvmRunInfo.mainClass);
Method mainMethod = mainClass.getMethod("main", String[].class); Method mainMethod = mainClass.getMethod("main", String[].class);
String[] mainArgs = jvmRunInfo.args.stream().toArray(String[]::new); String[] mainArgs = jvmRunInfo.args.stream().toArray(String[]::new);
mainMethod.invoke(null, (Object) mainArgs); mainMethod.invoke(null, (Object) mainArgs);
} finally {
cl.close();
} }
} else { } else {
throw new RuntimeException("only jvm is supported"); throw new RuntimeException("only jvm is supported");
@ -144,13 +141,8 @@ public final class WorkerMain {
if (info.jvm) { if (info.jvm) {
RunInfo.JvmRunInfo jvmRunInfo = info.jvmRunInfo; RunInfo.JvmRunInfo jvmRunInfo = info.jvmRunInfo;
ClassLoader parent = new ForkTestMain().getClass().getClassLoader(); ClassLoader parent = new ForkTestMain().getClass().getClassLoader();
ClassLoader cl = createClassLoader(jvmRunInfo, parent); try (URLClassLoader cl = createClassLoader(jvmRunInfo, parent)) {
try {
ForkTestMain.main(id, info, this.originalOut, cl); ForkTestMain.main(id, info, this.originalOut, cl);
} finally {
if (cl instanceof URLClassLoader) {
((URLClassLoader) cl).close();
}
} }
} else { } else {
throw new RuntimeException("only jvm is supported"); throw new RuntimeException("only jvm is supported");