commit 848fc649dd1e46e0a1b614f526a5592f99d1f735
author Timothy Bish <tabish121@gmail.com> Fri Sep 02 16:28:21 2022 -0400
committer Timothy Bish <tabish121@gmail.com> Fri Sep 02 16:28:21 2022 -0400
tree 56c6db1dd1975ec3f68f2e62469714eeb2c2b468
parent 72f9347cd79107077127f6173b6bbd1322b5a7b4

PROTON-2599 Create the settlement future from the callers thread

Lazy create the settlement future from the callers thread to move this
work out of the IO thread and avoid creating it when not ever used.

protonj2-client/src/main/java/org/apache/qpid/protonj2/client/impl/ClientTrackable.java

diff --git a/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/impl/ClientTrackable.java b/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/impl/ClientTrackable.java
index 0fb0883..1bf4a4b 100644
--- a/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/impl/ClientTrackable.java
+++ b/protonj2-client/src/main/java/org/apache/qpid/protonj2/client/impl/ClientTrackable.java
@@ -36,8 +36,7 @@
     protected final SenderType sender;
     protected final OutgoingDelivery delivery;
 
-    private final ClientFuture<TrackerType> remoteSettlementFuture;
-
+    private ClientFuture<TrackerType> remoteSettlementFuture;
     private volatile boolean remotelySettled;
     private volatile DeliveryState remoteDeliveryState;
 
@@ -53,7 +52,6 @@
         this.sender = sender;
         this.delivery = delivery;
         this.delivery.deliveryStateUpdatedHandler(this::processDeliveryUpdated);
-        this.remoteSettlementFuture = sender.session().getFutureFactory().createFuture();
     }
 
     protected abstract TrackerType self();
@@ -79,7 +77,12 @@
             sender.disposition(delivery, ClientDeliveryState.asProtonType(state), settle);
         } finally {
             if (settle) {
-                remoteSettlementFuture.complete(self());
+                synchronized (this) {
+                    if (remoteSettlementFuture == null) {
+                        remoteSettlementFuture = sender.session.connection().getFutureFactory().createFuture();
+                    }
+                    remoteSettlementFuture.complete(self());
+                }
             }
         }
 
@@ -90,7 +93,12 @@
         try {
             sender.disposition(delivery, null, true);
         } finally {
-            remoteSettlementFuture.complete(self());
+            synchronized (this) {
+                if (remoteSettlementFuture == null) {
+                    remoteSettlementFuture = sender.session.connection().getFutureFactory().createFuture();
+                }
+                remoteSettlementFuture.complete(self());
+            }
         }
 
         return self();
@@ -101,7 +109,13 @@
     }
 
     public ClientFuture<TrackerType> settlementFuture() {
-        if (delivery.isSettled()) {
+        synchronized (this) {
+            if (remoteSettlementFuture == null) {
+                remoteSettlementFuture = sender.session.connection().getFutureFactory().createFuture();
+            }
+        }
+
+        if (delivery.isSettled() || delivery.isRemotelySettled()) {
             remoteSettlementFuture.complete(self());
         }
 
@@ -189,11 +203,15 @@
         remoteDeliveryState = ClientDeliveryState.fromProtonType(delivery.getRemoteState());
 
         if (delivery.isRemotelySettled()) {
-            remoteSettlementFuture.complete(self());
-        }
+            if (sender.options.autoSettle()) {
+                delivery.settle();
+            }
 
-        if (sender.options.autoSettle() && delivery.isRemotelySettled()) {
-            delivery.settle();
+            synchronized (this) {
+                if (remoteSettlementFuture != null) {
+                    remoteSettlementFuture.complete(self());
+                }
+            }
         }
     }
 }