Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 62185 invoked from network); 6 Sep 2010 12:45:43 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Sep 2010 12:45:43 -0000 Received: (qmail 19738 invoked by uid 500); 6 Sep 2010 12:45:43 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 19626 invoked by uid 500); 6 Sep 2010 12:45:41 -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 19619 invoked by uid 99); 6 Sep 2010 12:45:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Sep 2010 12:45:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 06 Sep 2010 12:45:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B544E2388A38; Mon, 6 Sep 2010 12:45:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r993012 - in /cxf/branches/2.2.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/transport/ systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ systests/transports/src/test/java/org/apache/cxf/systest/jms/continuation... Date: Mon, 06 Sep 2010 12:45:19 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100906124519.B544E2388A38@eris.apache.org> Author: ffang Date: Mon Sep 6 12:45:19 2010 New Revision: 993012 URL: http://svn.apache.org/viewvc?rev=993012&view=rev Log: Merged revisions 993010 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r993010 | ffang | 2010-09-06 20:37:08 +0800 (δΈ€, 06 9 2010) | 1 line [CXF-2975]ChainInitiationObserver lack synchronization which could causes continuations to malfunction for some rare scenario ........ Added: cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HWSoapMessageDocProvider.java - copied unchanged from r993010, cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HWSoapMessageDocProvider.java cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/IncomingMessageCounterInterceptor.java - copied unchanged from r993010, cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/IncomingMessageCounterInterceptor.java cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java - copied unchanged from r993010, cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderServer.java - copied unchanged from r993010, cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderServer.java cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/resources/ - copied from r993010, cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/resources/ cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/resources/GreetMeDocLiteralResp.xml - copied unchanged from r993010, cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/resources/GreetMeDocLiteralResp.xml Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java?rev=993012&r1=993011&r2=993012&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java (original) +++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java Mon Sep 6 12:45:19 2010 @@ -64,9 +64,11 @@ public class ChainInitiationObserver imp if (m.getInterceptorChain() instanceof PhaseInterceptorChain) { phaseChain = (PhaseInterceptorChain)m.getInterceptorChain(); - if (phaseChain.getState() == InterceptorChain.State.PAUSED) { - phaseChain.resume(); - return; + synchronized (phaseChain) { + if (phaseChain.getState() == InterceptorChain.State.PAUSED) { + phaseChain.resume(); + return; + } } }