fix: ThreadId miss unlock(#1107) (#1108)

Co-authored-by: yxw <[email protected]>
sofastack · Jun 12, 2024 · f45e961 · f45e961
1 parent 890033a
commit f45e961
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/util/ThreadId.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/util/ThreadId.java
@@ -124,10 +124,9 @@ public void setError(final int errorCode) {
             if (this.onError != null) {
                 this.onError.onError(this, this.data, errorCode);
             }
-
         } finally {
-            // Maybe destroyed in callback
-            if (!this.destroyed) {
+            // It may have been released during onError to avoid throwing an exception.
+            if (this.lock.isHeldByCurrentThread()) {
                 this.lock.unlock();
             }
         }

diff --git a/jraft-core/src/test/java/com/alipay/sofa/jraft/util/ThreadIdTest.java b/jraft-core/src/test/java/com/alipay/sofa/jraft/util/ThreadIdTest.java
@@ -59,7 +59,7 @@ public void run() {
         Thread.sleep(1000);
         this.id.unlock();
         latch.await();
-        assertEquals(1000, cost.get(), 10);
+        assertEquals(1000, cost.get(), 20);
     }
 
     @Test