transition support for PAUSE deprecation

jpos · Sep 12, 2023 · bcba1e8 · bcba1e8
1 parent b91d37d
commit bcba1e8
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 8 deletions.
diff --git a/jpos/src/main/java/org/jpos/transaction/Context.java b/jpos/src/main/java/org/jpos/transaction/Context.java
@@ -29,7 +29,9 @@
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
-import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Stream;
 
 import static org.jpos.transaction.ContextConstants.*;
@@ -40,10 +42,9 @@ public class Context implements Externalizable, Loggeable, Cloneable, Pausable {
     private transient Map<Object,Object> map; // transient map
     private Map<Object,Object> pmap;          // persistent (serializable) map
     private transient boolean trace = false;
-    private final Semaphore paused = new Semaphore(1);
     private CompletableFuture<Integer> pausedFuture;
     private long timeout;
-
+    private final Lock lock = new ReentrantLock();
     public Context () {
         super ();
     }
@@ -535,16 +536,37 @@ public void setTrace(boolean trace) {
 
     @Override
     public Future<Integer> pause() {
-        paused.acquireUninterruptibly();
-        pausedFuture = new CompletableFuture<>();
+        try {
+            lock.lock();
+            if (pausedFuture == null)
+                pausedFuture = new CompletableFuture<>();
+            else if (!pausedFuture.isDone())
+                throw new IllegalStateException("already paused");
+        } finally {
+            lock.unlock();
+        }
         return pausedFuture;
     }
 
     @Override
     public void resume(int result) {
-        pausedFuture.complete(result);
-        pausedFuture = null;
-        paused.release();
+        try {
+            lock.lock();
+            if (pausedFuture == null)
+                pausedFuture = new CompletableFuture<>();
+            pausedFuture.complete(result);
+        } finally {
+            lock.unlock();
+        }
+    }
+    @Override
+    public void reset () {
+        try {
+            lock.lock();
+            pausedFuture = null;
+        } finally {
+            lock.unlock();
+        }
     }
 
     @Override

diff --git a/jpos/src/main/java/org/jpos/transaction/Pausable.java b/jpos/src/main/java/org/jpos/transaction/Pausable.java
@@ -25,4 +25,6 @@ public interface Pausable {
     long getTimeout();
     Future<Integer> pause();
     void resume(int result);
+
+    void reset();
 }
diff --git a/jpos/src/main/java/org/jpos/transaction/TransactionManager.java b/jpos/src/main/java/org/jpos/transaction/TransactionManager.java
@@ -1155,6 +1155,8 @@ private int pauseAndWait(Serializable context, int action) {
                     ctx.log(e);
             } catch (TimeoutException e) {
                 action &= (PREPARED ^ 0xFFFF); // turn off 'PREPARED' - we need to abort
+            } finally {
+                pausable.reset();
             }
         } finally {
             pausedSessions.decrementAndGet();