Author: ningjiang Date: Fri Mar 1 12:50:38 2013 New Revision: 1451576 URL: http://svn.apache.org/r1451576 Log: Merged revisions 1451570 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................ r1451570 | ningjiang | 2013-03-01 19:50:28 +0800 (Fri, 01 Mar 2013) | 16 lines Merged revisions 1451545 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ................ r1451545 | ningjiang | 2013-03-01 17:48:39 +0800 (Fri, 01 Mar 2013) | 9 lines 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.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1451545 Merged /cxf/trunk:r1451466 Merged /cxf/branches/2.6.x-fixes:r1451570 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java?rev=1451576&r1=1451575&r2=1451576&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java Fri Mar 1 12:50:38 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>();
