Fallback to synchronised keyword

testng-team · Mar 1, 2024 · 32d75e7 · 32d75e7
1 parent cc23c7b
commit 32d75e7
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/testng-core/src/main/java/org/testng/internal/invokers/TestMethodWorker.java b/testng-core/src/main/java/org/testng/internal/invokers/TestMethodWorker.java
@@ -102,8 +102,6 @@ public String toString() {
     return result.toString();
   }
 
-  private static final KeyAwareAutoCloseableLock lock = new KeyAwareAutoCloseableLock();
-
   /**
    * Run all the ITestNGMethods passed in through the constructor.
    *
@@ -121,9 +119,8 @@ && doesTaskHavePreRequisites()
 
     for (IMethodInstance testMethodInstance : m_methodInstances) {
       ITestNGMethod testMethod = testMethodInstance.getMethod();
-      String key = Integer.toString(testMethod.getInstance().toString().hashCode());
-      if (canInvokeBeforeClassMethods()) {
-        try (KeyAwareAutoCloseableLock.AutoReleasable ignore = lock.lockForObject(key)) {
+      synchronized (testMethod.getInstance()) {
+        if (canInvokeBeforeClassMethods()) {
           invokeBeforeClassMethods(testMethod.getTestClass(), testMethodInstance);
         }
       }
@@ -132,7 +129,7 @@ && doesTaskHavePreRequisites()
       try {
         invokeTestMethods(testMethod, testMethodInstance.getInstance());
       } finally {
-        try (KeyAwareAutoCloseableLock.AutoReleasable ignore = lock.lockForObject(key)) {
+        synchronized (testMethod.getInstance()) {
           invokeAfterClassMethods(testMethod.getTestClass(), testMethodInstance);
         }
       }