svn commit: r1224676 - in /camel/branches/camel-2.8.x: ./ components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java

[ningjiang]

Author: ningjiang
Date: Mon Dec 26 04:35:13 2011
New Revision: 1224676

URL: http://svn.apache.org/viewvc?rev=1224676&view=rev
Log:
Merged revisions 1224674 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1224674 | ningjiang | 2011-12-26 11:51:57 +0800 (Mon, 26 Dec 2011) | 1 line
  
  CAMEL-4829 Set the bus on the exchange in case the CXF interceptor needs it
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 26 04:35:13 2011
@@ -1 +1 @@
-/camel/trunk:1212504,1215477,1221565
+/camel/trunk:1212504,1215477,1221565,1224674

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=1224676&r1=1224675&r2=1224676&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
 Mon Dec 26 04:35:13 2011
@@ -35,6 +35,7 @@ import org.apache.camel.RuntimeCamelExce
 import org.apache.camel.component.cxf.common.message.CxfConstants;
 import org.apache.camel.impl.DefaultProducer;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.cxf.Bus;
 import org.apache.cxf.binding.soap.model.SoapHeaderInfo;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.jaxws.context.WrappedMessageContext;
@@ -79,6 +80,8 @@ public class CxfProducer extends Default
         try {
             // create CXF exchange
             ExchangeImpl cxfExchange = new ExchangeImpl();
+            // set the Bus on the exchange in case the CXF interceptor need to 
access it from exchange
+            cxfExchange.put(Bus.class, endpoint.getBus());
             
             // prepare binding operation info
             BindingOperationInfo boi = prepareBindingOperation(camelExchange, 
cxfExchange);
@@ -115,6 +118,8 @@ public class CxfProducer extends Default
         
         // create CXF exchange
         ExchangeImpl cxfExchange = new ExchangeImpl();
+        // set the Bus on the exchange in case the CXF interceptor need to 
access it from exchange
+        cxfExchange.put(Bus.class, endpoint.getBus());
         
         // prepare binding operation info
         BindingOperationInfo boi = prepareBindingOperation(camelExchange, 
cxfExchange);