Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 3071 invoked from network); 6 Nov 2006 19:03:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Nov 2006 19:03:17 -0000 Received: (qmail 88989 invoked by uid 500); 6 Nov 2006 19:03:20 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 88884 invoked by uid 500); 6 Nov 2006 19:03:20 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 88852 invoked by uid 99); 6 Nov 2006 19:03:19 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Nov 2006 11:03:19 -0800 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: domain of Daniel.Kulp@iona.com designates 63.65.132.112 as permitted sender) Received: from [63.65.132.112] (HELO amereast-smg2.iona.com) (63.65.132.112) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Nov 2006 11:03:05 -0800 Received: from emea-ems1.ionaglobal.com ([10.2.1.125]) by amereast-smg2.iona.com (Switch-3.1.7/Switch-3.1.7) with ESMTP id kA6Isr3u022149; Mon, 6 Nov 2006 13:54:56 -0500 (EST) Received: from amer-ems1.IONAGLOBAL.COM ([10.65.6.25]) by emea-ems1.ionaglobal.com with Microsoft SMTPSVC(5.0.2195.6713); Mon, 6 Nov 2006 19:02:25 +0000 Received: from dilbert.boston.amer.iona.com ([10.65.4.111]) by amer-ems1.IONAGLOBAL.COM with Microsoft SMTPSVC(6.0.3790.1830); Mon, 6 Nov 2006 14:02:23 -0500 From: Daniel Kulp To: cxf-commits@incubator.apache.org, cxf-dev@incubator.apache.org Subject: Re: svn commit: r471790 - in /incubator/cxf/trunk: rt/core/src/main/java/org/apache/cxf/endpoint/ rt/transports/http/src/main/java/org/apache/cxf/transport/http/ rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ rt/ws/addr/src/main/java/org/apache/cxf... Date: Mon, 6 Nov 2006 14:02:22 -0500 User-Agent: KMail/1.9.5 References: <20061106165022.F39061A9846@eris.apache.org> In-Reply-To: <20061106165022.F39061A9846@eris.apache.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200611061402.23573.daniel.kulp@iona.com> X-OriginalArrivalTime: 06 Nov 2006 19:02:23.0580 (UTC) FILETIME=[17B649C0:01C701D6] X-Virus-Checked: Checked by ClamAV on apache.org Eoghan, I'm still getting a failure in the MAP test: ------------------------------------------------------- T E S T S ------------------------------------------------------- [surefire] Running org.apache.cxf.systest.ws.addressing.MAPTest [surefire] Tests run: 3, Failures: 1, Errors: 0, Time elapsed: 8.161 sec [surefire] [surefire] testImplicitMAPs(org.apache.cxf.systest.ws.addressing.MAPTest) Time elapsed: 1.7 sec <<< FAILURE! junit.framework.ComparisonFailure: unexpected response received from service expected: but was: at junit.framework.Assert.assertEquals(Assert.java:81) at org.apache.cxf.systest.ws.addressing.MAPTest.testImplicitMAPs(MAPTest.java:138) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) That's only one test failing instead of two, so there is definitely an improvement. Also, the Sequence test is spitting out: Started server Created client bus Created GreeterService Created Greeter Invoking greetMeOneWay ... Thanks! Dan On Monday November 06 2006 11:50 am, eglynn@apache.org wrote: > Author: eglynn > Date: Mon Nov 6 08:50:21 2006 > New Revision: 471790 > > URL: http://svn.apache.org/viewvc?view=rev&rev=471790 > Log: > Fix for race condition around full responses overtaking partial > responses so that the exchange in message is intermittently > over-written. > > Modified: > > incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/Clien >tImpl.java > incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/tra >nsport/http/HTTPConduit.java > incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressi >ng/ContextUtils.java > incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressi >ng/soap/MAPCodec.java > incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/ad >dressing/HeaderVerifier.java > > Modified: > incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/Clien >tImpl.java URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/ >org/apache/cxf/endpoint/ClientImpl.java?view=diff&rev=471790&r1=471789&r >2=471790 > ======================================================================= >======= --- > incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/Clien >tImpl.java (original) +++ > incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/Clien >tImpl.java Mon Nov 6 08:50:21 2006 @@ -232,6 +232,7 @@ > synchronized (message.getExchange()) { > if (!isPartialResponse(message)) { > message.getExchange().put(FINISHED, Boolean.TRUE); > + message.getExchange().setInMessage(message); > message.getExchange().notifyAll(); > } > } > > Modified: > incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/tra >nsport/http/HTTPConduit.java URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src >/main/java/org/apache/cxf/transport/http/HTTPConduit.java?view=diff&rev= >471790&r1=471789&r2=471790 > ======================================================================= >======= --- > incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/tra >nsport/http/HTTPConduit.java (original) +++ > incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/tra >nsport/http/HTTPConduit.java Mon Nov 6 08:50:21 2006 @@ -565,7 +565,7 > @@ > InputStream responseStream = req.getInputStream(); > Message inMessage = new MessageImpl(); > // disposable exchange, swapped with real Exchange on > correlation - new ExchangeImpl().setInMessage(inMessage); > + inMessage.setExchange(new ExchangeImpl()); > // REVISIT: how to get response headers? > //inMessage.put(Message.PROTOCOL_HEADERS, req.getXXX()); > setHeaders(inMessage); > > Modified: > incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressi >ng/ContextUtils.java URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/main/ja >va/org/apache/cxf/ws/addressing/ContextUtils.java?view=diff&rev=471790&r >1=471789&r2=471790 > ======================================================================= >======= --- > incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressi >ng/ContextUtils.java (original) +++ > incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressi >ng/ContextUtils.java Mon Nov 6 08:50:21 2006 @@ -348,7 +348,9 @@ > > partialResponse.getInterceptorChain().reset(); > exchange.setConduit(null); > - exchange.setOutMessage(fullResponse); > + if (fullResponse != null) { > + exchange.setOutMessage(fullResponse); > + } > } > } catch (Exception e) { > LOG.log(Level.WARNING, > "SERVER_TRANSPORT_REBASE_FAILURE_MSG", e); > > Modified: > incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressi >ng/soap/MAPCodec.java URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/main/ja >va/org/apache/cxf/ws/addressing/soap/MAPCodec.java?view=diff&rev=471790& >r1=471789&r2=471790 > ======================================================================= >======= --- > incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressi >ng/soap/MAPCodec.java (original) +++ > incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressi >ng/soap/MAPCodec.java Mon Nov 6 08:50:21 2006 @@ -454,7 +454,7 @@ > > uncorrelatedExchanges.get(maps.getRelatesTo().getValue()); if > (correlatedExchange != null) { > synchronized (correlatedExchange) { > - correlatedExchange.setInMessage(message); > + message.setExchange(correlatedExchange); > } > } > } > > Modified: > incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/ad >dressing/HeaderVerifier.java URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java >/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java?view=diff&rev= >471790&r1=471789&r2=471790 > ======================================================================= >======= --- > incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/ad >dressing/HeaderVerifier.java (original) +++ > incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/ad >dressing/HeaderVerifier.java Mon Nov 6 08:50:21 2006 @@ -66,15 +66,19 > @@ > } > > public void handleMessage(SoapMessage message) { > + mediate(message); > + } > + > + public void handleFault(SoapMessage message) { > + mediate(message); > + } > + > + private void mediate(SoapMessage message) { > boolean outgoingPartialResponse = > isOutgoingPartialResponse(message); if (outgoingPartialResponse) { > addPartialResponseHeader(message); > } > verify(message, outgoingPartialResponse); > - } > - > - public void handleFault(SoapMessage message) { > - verify(message, isOutgoingPartialResponse(message)); > } > > private void addPartialResponseHeader(SoapMessage message) { -- J. Daniel Kulp Principal Engineer IONA P: 781-902-8727 C: 508-380-7194 F:781-902-8001 daniel.kulp@iona.com