JDWP.ThreadReference.STATUS#getThreadStatus now correctly returns MONITOR if thread is blocked on monitor enter.

rakachan · rakachan · commit b7c637efdfc3 · 2025-07-17T17:03:15.000+02:00
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
@@ -2093,7 +2093,7 @@ private static int getThreadStatus(int jvmtiThreadStatus) {
                     if ((masked & JVMTI_THREAD_STATE_RUNNABLE) != 0) {
                         return ThreadStatusConstants.RUNNING;
                     } else if ((masked & JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER) != 0) {
-                        return ThreadStatusConstants.WAIT;
+                        return ThreadStatusConstants.MONITOR;
                     }
                     return ThreadStatusConstants.RUNNING;
                 } else if ((masked & JVMTI_THREAD_STATE_WAITING) != 0) {

Original file line number	Diff line number	Diff line change
`@@ -2093,7 +2093,7 @@ private static int getThreadStatus(int jvmtiThreadStatus) {`
`2093`	`2093`	`if ((masked & JVMTI_THREAD_STATE_RUNNABLE) != 0) {`
`2094`	`2094`	`return ThreadStatusConstants.RUNNING;`
`2095`	`2095`	`} else if ((masked & JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER) != 0) {`
`2096`		`- return ThreadStatusConstants.WAIT;`
	`2096`	`+ return ThreadStatusConstants.MONITOR;`
`2097`	`2097`	`}`
`2098`	`2098`	`return ThreadStatusConstants.RUNNING;`
`2099`	`2099`	`} else if ((masked & JVMTI_THREAD_STATE_WAITING) != 0) {`