You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2021/02/11 01:05:51 UTC
[cxf] branch 3.3.x-fixes updated: CXF-8400: Attempt to fix
org.apache.cxf.systest.ws.rm.ManagedEndpointsTest.testManagedEndpointsOneway/testManagedEndpointsOneway12
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new 21f1164 CXF-8400: Attempt to fix org.apache.cxf.systest.ws.rm.ManagedEndpointsTest.testManagedEndpointsOneway/testManagedEndpointsOneway12
21f1164 is described below
commit 21f1164cb431ae7cc38bf22f04a8cc1f796ca1a6
Author: reta <dr...@gmail.com>
AuthorDate: Tue Feb 9 21:57:27 2021 -0500
CXF-8400: Attempt to fix org.apache.cxf.systest.ws.rm.ManagedEndpointsTest.testManagedEndpointsOneway/testManagedEndpointsOneway12
(cherry picked from commit 9cdafe54e70b95ed91ec5c4d56478e6d84f575e5)
---
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java | 2 +-
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMProperties.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
index 59b59fa..983d308 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
@@ -60,7 +60,7 @@ public class DestinationSequence extends AbstractSequence {
private EndpointReferenceType acksTo;
private long lastMessageNumber;
private SequenceMonitor monitor;
- private boolean acknowledgeOnNextOccasion;
+ private volatile boolean acknowledgeOnNextOccasion;
private boolean terminated;
private List<DeferredAcknowledgment> deferredAcknowledgments;
private SequenceTermination scheduledTermination;
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMProperties.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMProperties.java
index 345d617..d696536 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMProperties.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMProperties.java
@@ -19,7 +19,6 @@
package org.apache.cxf.ws.rm;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -97,7 +96,7 @@ public class RMProperties {
public void addAck(DestinationSequence seq) {
if (null == acks) {
- acks = new ArrayList<>();
+ acks = new CopyOnWriteArrayList<>();
}
SequenceAcknowledgement ack = seq.getAcknowledgment();
acks.add(ack);