diff --git a/vm/vmcore/src/jvmti/jvmti_break_intf.cpp b/vm/vmcore/src/jvmti/jvmti_break_intf.cpp index 31f088d..e9f3cd5 100644 --- a/vm/vmcore/src/jvmti/jvmti_break_intf.cpp +++ b/vm/vmcore/src/jvmti/jvmti_break_intf.cpp @@ -1385,9 +1385,6 @@ void jvmti_set_pending_breakpoints(Metho if (!ti->isEnabled()) return; - if( !method->get_pending_breakpoints() ) - return; - VMBreakPoints* vm_brpt = ti->vm_brpt; LMAutoUnlock lock(vm_brpt->get_lock()); diff --git a/vm/vmcore/src/jvmti/jvmti_step.cpp b/vm/vmcore/src/jvmti/jvmti_step.cpp index 03d6198..d080cdb 100644 --- a/vm/vmcore/src/jvmti/jvmti_step.cpp +++ b/vm/vmcore/src/jvmti/jvmti_step.cpp @@ -466,6 +466,9 @@ jvmti_set_single_step_breakpoints_for_me { if (ti->isEnabled() && ti->is_single_step_enabled()) { + if (method->is_native()) // Must not single step through native methods + return; + LMAutoUnlock lock(ti->vm_brpt->get_lock()); if (NULL != vm_thread->ss_state) {