diff --git a/vm/interpreter/src/interpreter.cpp b/vm/interpreter/src/interpreter.cpp index 86b9abf..300461d 100644 --- a/vm/interpreter/src/interpreter.cpp +++ b/vm/interpreter/src/interpreter.cpp @@ -2569,8 +2569,8 @@ restart: & INTERPRETER_TI_SINGLE_STEP_EVENT) { single_step_callback(frame); } - assert(!exn_raised()); - if (get_thread_ptr()->p_exception_object_ti) { + //assert(!exn_raised()); + if (get_thread_ptr()->p_exception_object_ti || exn_raised()) { frame.exc = get_current_thread_exception(); goto got_exception; } diff --git a/vm/vmcore/src/jvmti/jvmti_capability.cpp b/vm/vmcore/src/jvmti/jvmti_capability.cpp index 81a31c1..869431d 100644 --- a/vm/vmcore/src/jvmti/jvmti_capability.cpp +++ b/vm/vmcore/src/jvmti/jvmti_capability.cpp @@ -116,7 +116,7 @@ static const jvmtiCapabilities jvmti_ena 1, // can_get_monitor_info 0, // can_pop_frame 0, // can_redefine_classes - 0, // can_signal_thread + 1, // can_signal_thread 1, // can_get_source_file_name 1, // can_get_line_numbers 1, // can_get_source_debug_extension