Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5C79DED50 for ; Fri, 1 Mar 2013 12:51:03 +0000 (UTC) Received: (qmail 73257 invoked by uid 500); 1 Mar 2013 12:51:02 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 73125 invoked by uid 500); 1 Mar 2013 12:51:01 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 73096 invoked by uid 99); 1 Mar 2013 12:51:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Mar 2013 12:51:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Mar 2013 12:50:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 46EDB2388A33; Fri, 1 Mar 2013 12:50:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1451576 - in /cxf/branches/2.5.x-fixes: ./ rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java Date: Fri, 01 Mar 2013 12:50:39 -0000 To: commits@cxf.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130301125039.46EDB2388A33@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 deferredAcknowledgments; private SequenceTermination scheduledTermination; private String correlationID; - private long inProcessNumber; - private long highNumberCompleted; + private volatile long inProcessNumber; + private volatile long highNumberCompleted; private List continuations = new LinkedList(); private Set deliveringMessageNumbers = new HashSet();