You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2013/07/16 00:47:17 UTC
svn commit: r1503508 - in /cxf/branches/2.6.x-fixes: ./
rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java
Author: asoldano
Date: Mon Jul 15 22:47:16 2013
New Revision: 1503508
URL: http://svn.apache.org/r1503508
Log:
Merged revisions 1503503 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................
r1503503 | asoldano | 2013-07-16 00:27:10 +0200 (Tue, 16 Jul 2013) | 9 lines
Merged revisions 1503498 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1503498 | asoldano | 2013-07-16 00:22:46 +0200 (Tue, 16 Jul 2013) | 2 lines
[CXF-5116] Also fixing JAXWS 2.2 HTTP SPI destination impl
........
................
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jul 15 22:47:16 2013
@@ -0,0 +1,2 @@
+/cxf/branches/2.7.x-fixes:1503503
+/cxf/trunk:1503498
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java?rev=1503508&r1=1503507&r2=1503508&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/jaxws22/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestination.java Mon Jul 15 22:47:16 2013
@@ -135,12 +135,12 @@ public class JAXWSHttpSpiDestination ext
LOG.fine("Service http request on thread: " + Thread.currentThread());
}
Message inMessage = new MessageImpl();
+ ExchangeImpl exchange = new ExchangeImpl();
+ exchange.setInMessage(inMessage);
setupMessage(inMessage, null, req, resp);
((MessageImpl)inMessage).setDestination(this);
- ExchangeImpl exchange = new ExchangeImpl();
- exchange.setInMessage(inMessage);
exchange.setSession(new HTTPSession(req));
try {