infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8299934: LocalExecutionControl replaces default uncaught exception handler

Browse Source 
Reviewed-by: liach
This commit is contained in:
Jan Lahoda 2025-05-05 09:00:59 +00:00
parent 6dd5553823
commit f1e06c3c05
2 changed files with 169 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java
View File

@ -132,28 +132,29 @@ public class LocalExecutionControl extends DirectExecutionControl {
}
allStop.set(null, false);
execThreadGroup = new ThreadGroup("JShell process local execution");
AtomicReference<InvocationTargetException> iteEx = new AtomicReference<>();
AtomicReference<IllegalAccessException> iaeEx = new AtomicReference<>();
AtomicReference<NoSuchMethodException> nmeEx = new AtomicReference<>();
AtomicReference<Boolean> stopped = new AtomicReference<>(false);
Thread.setDefaultUncaughtExceptionHandler((t, e) -> {
if (e instanceof InvocationTargetException) {
if (e.getCause() instanceof ThreadDeath) {
execThreadGroup = new ThreadGroup("JShell process local execution") {
@Override
public void uncaughtException(Thread t, Throwable e) {
if (e instanceof InvocationTargetException) {
if (e.getCause() instanceof ThreadDeath) {
stopped.set(true);
} else {
iteEx.set((InvocationTargetException) e);
}
} else if (e instanceof IllegalAccessException) {
iaeEx.set((IllegalAccessException) e);
} else if (e instanceof NoSuchMethodException) {
nmeEx.set((NoSuchMethodException) e);
} else if (e instanceof ThreadDeath) {
stopped.set(true);
} else {
iteEx.set((InvocationTargetException) e);
}
} else if (e instanceof IllegalAccessException) {
iaeEx.set((IllegalAccessException) e);
} else if (e instanceof NoSuchMethodException) {
nmeEx.set((NoSuchMethodException) e);
} else if (e instanceof ThreadDeath) {
stopped.set(true);
}
});
};
final Object[] res = new Object[1];
Thread snippetThread = new Thread(execThreadGroup, () -> {

154
test/langtools/jdk/jshell/LocalExecutionControlExceptionTest.java Normal file
View File

@ -0,0 +1,154 @@
/*
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8299934
* @summary Test LocalExecutionControl
* @run junit LocalExecutionControlExceptionTest
*/
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import jdk.jshell.EvalException;
import jdk.jshell.JShell;
import jdk.jshell.execution.LocalExecutionControlProvider;
import org.junit.jupiter.api.*;
import org.junit.jupiter.api.extension.*;
public class LocalExecutionControlExceptionTest {
@Test
@ExtendWith(NoUncaughtExceptionHandleInterceptor.class)
public void testUncaughtExceptions() throws InterruptedException {
List<Throwable> excs = new ArrayList<>();
ByteArrayOutputStream out = new ByteArrayOutputStream();
Thread.setDefaultUncaughtExceptionHandler((t, ex) -> excs.add(ex));
try (var jshell = JShell.builder()
.err(new PrintStream(out))
.out(new PrintStream(out))
.executionEngine(new LocalExecutionControlProvider(), Map.of())
.build()) {
{
var events = jshell.eval("throw new java.io.IOException();");
Assertions.assertEquals(1, events.size());
Assertions.assertNotNull(events.get(0).exception());
Assertions.assertTrue(events.get(0).exception() instanceof EvalException);
Assertions.assertEquals("java.io.IOException",
((EvalException) events.get(0).exception()).getExceptionClassName());
Assertions.assertEquals(0, excs.size());
Assertions.assertEquals(0, out.size());
}
{
var events = jshell.eval("throw new IllegalAccessException();");
Assertions.assertEquals(1, events.size());
Assertions.assertNotNull(events.get(0).exception());
Assertions.assertTrue(events.get(0).exception() instanceof EvalException);
Assertions.assertEquals("java.lang.IllegalAccessException",
((EvalException) events.get(0).exception()).getExceptionClassName());
Assertions.assertEquals(0, excs.size());
Assertions.assertEquals(0, out.size());
}
jshell.eval("""
<T extends Throwable> T t2(Throwable t) throws T {
throw (T) t;
}
""");
jshell.eval("""
void t(Throwable t) {
throw t2(t);
}
""");
{
var events = jshell.eval("""
{
var t = new Thread(() -> t(new java.io.IOException()));
t.start();
t.join();
}
""");
Assertions.assertEquals(1, events.size());
Assertions.assertNull(events.get(0).exception());
Assertions.assertEquals(0, excs.size());
Assertions.assertEquals(0, out.size());
}
{
var events = jshell.eval("""
{
var t = new Thread(() -> t(new IllegalAccessException()));
t.start();
t.join();
}
""");
Assertions.assertEquals(1, events.size());
Assertions.assertNull(events.get(0).exception());
Assertions.assertEquals(0, excs.size());
Assertions.assertEquals(0, out.size());
}
Thread outsideOfJShell = new Thread(() -> {
t(new IOException());
});
outsideOfJShell.start();
outsideOfJShell.join();
Assertions.assertEquals(1, excs.size());
}
}
void t(Throwable t) {
throw t2(t);
}
<T extends Throwable> T t2(Throwable t) throws T {
throw (T) t;
}
public static final class NoUncaughtExceptionHandleInterceptor implements InvocationInterceptor {
public void interceptTestMethod(Invocation<Void> invocation,
ReflectiveInvocationContext<Method> invocationContext,
ExtensionContext extensionContext) throws Throwable {
Throwable[] exc = new Throwable[1];
//the tests normally run in a ThreadGroup which handles uncaught exception
//run in a ThreadGroup which does not handle the uncaught exceptions, and let them
//pass to the default uncaught handler for the test:
var thread = new Thread(Thread.currentThread().getThreadGroup().getParent(), "test-group") {
public void run() {
try {
invocation.proceed();
} catch (Throwable ex) {
exc[0] = ex;
}
}
};
thread.start();
thread.join();
if (exc[0] != null) {
throw exc[0];
}
}
}
}