commit c882bafc25bfa50e7d59871700004a7d1c925579
author Timothy Bish <tabish121@gmail.com> Tue Sep 13 17:49:45 2022 -0400
committer Timothy Bish <tabish121@gmail.com> Tue Sep 13 17:49:45 2022 -0400
tree f96df327acd57d8ce6e777f0258294fbe1835f9c
parent 92249550a365a6faf0fa0bdfd9b578ac3e99bb0f

PROTON-2599 Fix additional race causing an intermittent test failures

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 6161585..f993271 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
@@ -212,14 +212,14 @@
 
     private void processDeliveryUpdated(OutgoingDelivery delivery) {
         if (delivery.isRemotelySettled()) {
-            REMOTELY_SETTLED_UPDATER.lazySet(this, 1);
-            REMOTEL_DELIVERY_STATE_UPDATER.lazySet(this, ClientDeliveryState.fromProtonType(delivery.getRemoteState()));
-
             if (sender.options.autoSettle()) {
                 delivery.settle();
             }
 
             synchronized (this) {
+                REMOTELY_SETTLED_UPDATER.lazySet(this, 1);
+                REMOTEL_DELIVERY_STATE_UPDATER.lazySet(this, ClientDeliveryState.fromProtonType(delivery.getRemoteState()));
+
                 if (remoteSettlementFuture != null) {
                     remoteSettlementFuture.complete(self());
                 }