8270869: G1ServiceThread may not terminate

Reviewed-by: ayang, tschatzl
openjdk · Jul 20, 2021 · 7f35e5b · 7f35e5b · openjdk-notifier · Jul 20, 2021
1 parent c3519c3
commit 7f35e5b
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/hotspot/share/gc/g1/g1ServiceThread.cpp b/src/hotspot/share/gc/g1/g1ServiceThread.cpp
@@ -112,12 +112,10 @@ void G1ServiceThread::notify() {
 }
 
 void G1ServiceThread::sleep_before_next_cycle() {
+  MonitorLocker ml(&_monitor, Mutex::_no_safepoint_check_flag);
   if (should_terminate()) {
     return;
-  }
-
-  MonitorLocker ml(&_monitor, Mutex::_no_safepoint_check_flag);
-  if (_task_queue.is_empty()) {
+  } else if (_task_queue.is_empty()) {
     // Sleep until new task is registered if no tasks available.
     log_trace(gc, task)("G1 Service Thread (wait for new tasks)");
     ml.wait(0);