From dc3843919ee660d796f7c842ccd775854253ef07 Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Tue, 19 May 2020 14:46:20 -0700
Subject: [PATCH] 8229829: java/lang/management/ThreadMXBean/Locks.java fails
 with java.lang.RuntimeException: Thread WaitingThread is at WAITING state but
 is expected to be in Thread.State = WAITING

Reviewed-by: sspitsyn, dholmes
---
 test/jdk/java/lang/management/ThreadMXBean/Locks.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/jdk/java/lang/management/ThreadMXBean/Locks.java b/test/jdk/java/lang/management/ThreadMXBean/Locks.java
index cc91d2ecfb8..c3666b21f7e 100644
--- a/test/jdk/java/lang/management/ThreadMXBean/Locks.java
+++ b/test/jdk/java/lang/management/ThreadMXBean/Locks.java
@@ -91,7 +91,9 @@ public class Locks {
         long tid = t.getId();
         Thread.State actualState = TM.getThreadInfo(tid).getThreadState();
         if (!actualState.equals(expectedState)) {
-            if (expectedState.equals(Thread.State.BLOCKED)) {
+            if (expectedState.equals(Thread.State.BLOCKED) ||
+                expectedState.equals(Thread.State.WAITING))
+            {
                 int retryCount = 0;
                 printStackTrace(t);
                 do {