Author: ningjiang
Date: Fri Mar 1 09:48:39 2013
New Revision: 1451545
URL: http://svn.apache.org/r1451545
Log:
Merged revisions 1451466 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1451466 | ningjiang | 2013-03-01 11:52:52 +0800 (Fri, 01 Mar 2013) | 1 line
CXF-4864 Fixed the concurrency issue of DestinationSequence
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1451466
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.7.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java?rev=1451545&r1=1451544&r2=1451545&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
Fri Mar 1 09:48:39 2013
@@ -62,8 +62,8 @@ public class DestinationSequence extends
private List<DeferredAcknowledgment> deferredAcknowledgments;
private SequenceTermination scheduledTermination;
private String correlationID;
- private long inProcessNumber;
- private long highNumberCompleted;
+ private volatile long inProcessNumber;
+ private volatile long highNumberCompleted;
private List<Continuation> continuations = new LinkedList<Continuation>();
private Set<Long> deliveringMessageNumbers = new HashSet<Long>();