This is an automated email from the ASF dual-hosted git repository. tabish pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-protonj2.git
The following commit(s) were added to refs/heads/main by this push: new c882bafc PROTON-2599 Fix additional race causing an intermittent test failures c882bafc is described below commit c882bafc25bfa50e7d59871700004a7d1c925579 Author: Timothy Bish <tabish...@gmail.com> AuthorDate: Tue Sep 13 17:49:45 2022 -0400 PROTON-2599 Fix additional race causing an intermittent test failures --- .../java/org/apache/qpid/protonj2/client/impl/ClientTrackable.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 61615852..f9932713 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 @@ public abstract class ClientTrackable<SenderType extends ClientSenderLinkType<?> 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()); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org