Author: dkulp
Date: Tue Apr 6 20:20:29 2010
New Revision: 931303
URL: http://svn.apache.org/viewvc?rev=931303&view=rev
Log:
Merged revisions 931234 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r931234 | dkulp | 2010-04-06 13:13:41 -0400 (Tue, 06 Apr 2010) | 1 line
[CXF-2733] Reattempt a fix for this
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.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/MultipleEndpointObserver.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java?rev=931303&r1=931302&r2=931303&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
Tue Apr 6 20:20:29 2010
@@ -58,13 +58,15 @@ public class MultipleEndpointObserver im
Bus origBus = BusFactory.getThreadDefaultBus(false);
BusFactory.setThreadDefaultBus(bus);
try {
- message = createMessage(message);
Exchange exchange = message.getExchange();
if (exchange == null) {
exchange = new ExchangeImpl();
exchange.setInMessage(message);
message.setExchange(exchange);
}
+ message = createMessage(message);
+ message.setExchange(exchange);
+ exchange.setInMessage(message);
setExchangeProperties(exchange, message);
// setup chain
