Pending transaction threads should exit when they timed out waiting, …

…not sooner.
cojen · Oct 17, 2024 · 165de50 · 165de50
1 parent cc38444
commit 165de50
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/main/java/org/cojen/tupl/core/PendingTxnFinisher.java b/src/main/java/org/cojen/tupl/core/PendingTxnFinisher.java
@@ -74,7 +74,7 @@ void interrupt() {
     @Override
     public void run() {
         while (true) {
-            boolean waited = false;
+            int awaitResult = 1; // signaled
             PendingTxn pending;
             acquireExclusive();
             try {
@@ -89,7 +89,8 @@ public void run() {
                         }
                         break;
                     }
-                    if (waited) {
+
+                    if (awaitResult <= 0) { // interrupted or timed out
                         mTotalThreads--;
                         return;
                     }
@@ -99,9 +100,7 @@ public void run() {
                     // closely match the amount that's needed.
                     long nanosTimeout = 10_000_000_000L;
                     long nanosEnd = System.nanoTime() + nanosTimeout;
-                    mIdleCondition.priorityAwait(this, nanosTimeout, nanosEnd);
-
-                    waited = true;
+                    awaitResult = mIdleCondition.priorityAwait(this, nanosTimeout, nanosEnd);
                 }
             } finally {
                 releaseExclusive();