camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1224677 - in /camel/branches/camel-2.7.x: ./ components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
Date Mon, 26 Dec 2011 04:43:03 GMT
Author: ningjiang
Date: Mon Dec 26 04:43:02 2011
New Revision: 1224677

URL: http://svn.apache.org/viewvc?rev=1224677&view=rev
Log:
Merged revisions 1224676 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x

................
  r1224676 | ningjiang | 2011-12-26 12:35:13 +0800 (Mon, 26 Dec 2011) | 9 lines
  
  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.7.x/   (props changed)
    camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 26 04:43:02 2011
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933,1210779,1210916,1211366,1211774,1211814,1213201,1213531,1214058,1214648,1220717,1221574,1222020,1222077
-/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930,1210771,1210830,1211363,1211773,1211811,1213197,1213219,1213526,1214639,1220711,1221566,1222006,1222066
+/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933,1210779,1210916,1211366,1211774,1211814,1213201,1213531,1214058,1214648,1220717,1221574,1222020,1222077,1224676
+/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930,1210771,1210830,1211363,1211773,1211811,1213197,1213219,1213526,1214639,1220711,1221566,1222006,1222066,1224674

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

Modified: camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=1224677&r1=1224676&r2=1224677&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
(original)
+++ camel/branches/camel-2.7.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
Mon Dec 26 04:43:02 2011
@@ -34,6 +34,7 @@ import org.apache.camel.InvalidPayloadEx
 import org.apache.camel.RuntimeCamelException;
 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;
@@ -80,6 +81,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);
@@ -118,6 +121,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);



Mime
View raw message