Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 7180 invoked from network); 7 Nov 2006 10:48:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Nov 2006 10:48:41 -0000 Received: (qmail 81131 invoked by uid 500); 7 Nov 2006 10:48:51 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 80879 invoked by uid 500); 7 Nov 2006 10:48:50 -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 80861 invoked by uid 99); 7 Nov 2006 10:48:50 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Nov 2006 02:48:50 -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 eoghan.glynn@iona.com designates 65.223.216.181 as permitted sender) Received: from [65.223.216.181] (HELO amereast-smg1.iona.com) (65.223.216.181) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Nov 2006 02:48:36 -0800 Received: from emea-ems1.ionaglobal.com ([10.2.1.125]) by amereast-smg1.iona.com (Switch-3.1.7/Switch-3.1.7) with ESMTP id kA7AlpWN022676; Tue, 7 Nov 2006 05:47:52 -0500 (EST) X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable 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/cx Date: Tue, 7 Nov 2006 10:48:12 -0000 Message-ID: X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: 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/cx Thread-Index: AccB7nYk75frnUfvRS2etcf47L/f0AAZ4ImA From: "Glynn, Eoghan" To: , X-Virus-Checked: Checked by ClamAV on apache.org =20 > -----Original Message----- > I'm still getting a failure in the MAP test: >=20 > That's only one test failing instead of two, so there is=20 > definitely an improvement. OK I can only surmise that either there's another race condition lurking, or the unrelated changes to ClientImpl that went in on Monday afternoon have collided with my fix. Either way, I'll need ssh access to your Linux laptop again to investigate further. Let me know when its back on the network. =20 > Also, the Sequence test is spitting out: > Started server > Created client bus > Created GreeterService > Created Greeter > Invoking greetMeOneWay ... Well yeah, that's cos the SequenceTest now appears to include a bunch of printlns. This is unconnected to the current issue with the MAPTest though. /Eoghan >=20 >=20 > Thanks! > Dan >=20 >=20 >=20 >=20 >=20 >=20 > 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=3Drev&rev=3D471790 > > Log: > > Fix for race condition around full responses overtaking partial > > responses so that the exchange in message is intermittently > > over-written. > > > > Modified: > > =20 > >=20 > incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpo > int/Clien > >tImpl.java > >=20 > incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach > e/cxf/tra > >nsport/http/HTTPConduit.java > >=20 > incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws > /addressi > >ng/ContextUtils.java > >=20 > incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws > /addressi > >ng/soap/MAPCodec.java > >=20 > incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/syst > est/ws/ad > >dressing/HeaderVerifier.java > > > > Modified: > >=20 > incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpo > int/Clien > >tImpl.java URL: > >=20 > http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/m > ain/java/ > >org/apache/cxf/endpoint/ClientImpl.java?view=3Ddiff&rev=3D471790& > r1=3D471789&r > >2=3D471790 > >=20 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > >=3D=3D=3D=3D=3D=3D=3D --- > >=20 > incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpo > int/Clien > >tImpl.java (original) +++ > >=20 > incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpo > int/Clien > >tImpl.java Mon Nov 6 08:50:21 2006 @@ -232,6 +232,7 @@ > > synchronized (message.getExchange()) { > > if (!isPartialResponse(message)) { > > message.getExchange().put(FINISHED,=20 > Boolean.TRUE); > > + message.getExchange().setInMessage(message); > > message.getExchange().notifyAll(); > > } > > } > > > > Modified: > >=20 > incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach > e/cxf/tra > >nsport/http/HTTPConduit.java URL: > >=20 > http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports > /http/src > >/main/java/org/apache/cxf/transport/http/HTTPConduit.java?vie > w=3Ddiff&rev=3D > >471790&r1=3D471789&r2=3D471790 > >=20 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > >=3D=3D=3D=3D=3D=3D=3D --- > >=20 > incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach > e/cxf/tra > >nsport/http/HTTPConduit.java (original) +++ > >=20 > incubator/cxf/trunk/rt/transports/http/src/main/java/org/apach > e/cxf/tra > >nsport/http/HTTPConduit.java Mon Nov 6 08:50:21 2006 @@=20 > -565,7 +565,7 > > @@ > > InputStream responseStream =3D req.getInputStream(); > > Message inMessage =3D 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,=20 > req.getXXX()); > > setHeaders(inMessage); > > > > Modified: > >=20 > incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws > /addressi > >ng/ContextUtils.java URL: > >=20 > http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/sr > c/main/ja > >va/org/apache/cxf/ws/addressing/ContextUtils.java?view=3Ddiff&r > ev=3D471790&r > >1=3D471789&r2=3D471790 > >=20 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > >=3D=3D=3D=3D=3D=3D=3D --- > >=20 > incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws > /addressi > >ng/ContextUtils.java (original) +++ > >=20 > 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 !=3D null) { > > + exchange.setOutMessage(fullResponse); > > + } > > } > > } catch (Exception e) { > > LOG.log(Level.WARNING, > > "SERVER_TRANSPORT_REBASE_FAILURE_MSG", e); > > > > Modified: > >=20 > incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws > /addressi > >ng/soap/MAPCodec.java URL: > >=20 > http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/sr > c/main/ja > >va/org/apache/cxf/ws/addressing/soap/MAPCodec.java?view=3Ddiff& > rev=3D471790& > >r1=3D471789&r2=3D471790 > >=20 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > >=3D=3D=3D=3D=3D=3D=3D --- > >=20 > incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws > /addressi > >ng/soap/MAPCodec.java (original) +++ > >=20 > 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 @@ > > =20 > > uncorrelatedExchanges.get(maps.getRelatesTo().getValue()); if > > (correlatedExchange !=3D null) { > > synchronized (correlatedExchange) { > > - correlatedExchange.setInMessage(message); > > + message.setExchange(correlatedExchange); > > } > > } > > } > > > > Modified: > >=20 > incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/syst > est/ws/ad > >dressing/HeaderVerifier.java URL: > >=20 > http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/ > test/java > >/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java?vie > w=3Ddiff&rev=3D > >471790&r1=3D471789&r2=3D471790 > >=20 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > >=3D=3D=3D=3D=3D=3D=3D --- > >=20 > incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/syst > est/ws/ad > >dressing/HeaderVerifier.java (original) +++ > >=20 > incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/syst > est/ws/ad > >dressing/HeaderVerifier.java Mon Nov 6 08:50:21 2006 @@=20 > -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 =3D > > isOutgoingPartialResponse(message); if (outgoingPartialResponse) { > > addPartialResponseHeader(message); > > } > > verify(message, outgoingPartialResponse); > > - } > > - > > - public void handleFault(SoapMessage message) { > > - verify(message, isOutgoingPartialResponse(message)); > > } > > > > private void addPartialResponseHeader(SoapMessage message) { >=20 > --=20 > J. Daniel Kulp > Principal Engineer > IONA > P: 781-902-8727 C: 508-380-7194 F:781-902-8001 > daniel.kulp@iona.com >=20