From 7d4507699044438acbab560ea621d965f8cd8f2c Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 8 Jul 2022 14:16:11 +0200
Subject: [PATCH] [junit] avoid deadlock on runner retrieval (IDEA-297642)

GitOrigin-RevId: 07e44c38acb6d54ec60698e3fdab590e66148dbe
---
 .../src/com/intellij/execution/junit/TestObject.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
index 0b57d35e6495..2be1ae14d2b9 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
@@ -662,13 +662,16 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
   }
 
   private String myRunner;
+  private static final Object LOCK = ObjectUtils.sentinel("JUnitRunner");
 
   @NotNull
-  protected synchronized String getRunner() {
-    if (myRunner == null) {
-      myRunner = ReadAction.nonBlocking(this::getRunnerInner).executeSynchronously();
+  protected String getRunner() {
+    synchronized (LOCK) {
+      if (myRunner == null) {
+        myRunner = ReadAction.nonBlocking(this::getRunnerInner).executeSynchronously();
+      }
+      return myRunner;
     }
-    return myRunner;
   }
 
   @NotNull