2021-02-02 11:40:07 +08:00
|
|
|
From 2c8ad6489ccb8c160dc0ddcfd1811c27828221f2 Mon Sep 17 00:00:00 2001
|
|
|
|
|
Date: Fri, 22 Jan 2021 11:11:56 +0800
|
|
|
|
|
Subject: fix crash in JVMTI debug
|
2020-09-11 18:42:18 +08:00
|
|
|
|
|
|
|
|
---
|
|
|
|
|
hotspot/src/share/vm/prims/jvmtiEnvBase.cpp | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp b/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp
|
2021-02-02 11:40:07 +08:00
|
|
|
index fe2a38116..5db415676 100644
|
2020-09-11 18:42:18 +08:00
|
|
|
--- a/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp
|
|
|
|
|
+++ b/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp
|
|
|
|
|
@@ -1092,7 +1092,7 @@ JvmtiEnvBase::get_object_monitor_usage(JavaThread* calling_thread, jobject objec
|
|
|
|
|
// If the monitor has no owner, then a non-suspended contending
|
|
|
|
|
// thread could potentially change the state of the monitor by
|
|
|
|
|
// entering it. The JVM/TI spec doesn't allow this.
|
|
|
|
|
- if (owning_thread == NULL && !at_safepoint &
|
|
|
|
|
+ if (owning_thread == NULL && !at_safepoint &&
|
|
|
|
|
!JvmtiEnv::is_thread_fully_suspended(pending_thread, true, &debug_bits)) {
|
|
|
|
|
if (ret.owner != NULL) {
|
|
|
|
|
destroy_jni_reference(calling_thread, ret.owner);
|
|
|
|
|
--
|
|
|
|
|
2.19.0
|
|
|
|
|
|
