Author: ningjiang Date: Thu Mar 15 08:52:51 2012 New Revision: 1300853 URL: http://svn.apache.org/viewvc?rev=1300853&view=rev Log: Merged revisions 1300845 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x
................ r1300845 | ningjiang | 2012-03-15 16:41:32 +0800 (Thu, 15 Mar 2012) | 9 lines Merged revisions 1300826 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1300826 | ningjiang | 2012-03-15 15:37:29 +0800 (Thu, 15 Mar 2012) | 1 line CAMEL-5089 InterceptorSendToEndpoint should start and stop the producer which is intercepted ........ ................ Modified: camel/branches/camel-2.8.x/ (props changed) camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 15 08:52:51 2012 @@ -1,2 +1,2 @@ -/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006,1241489,1243052,1243058,1244875,1244877,1291871,1292116,1292389,1292726,1292769,1293082,1293935,1294044,1294589,1294914,1294978,1299165,1300806,1300835 -/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950,1240967,1241482,1243046,1243057,1244870,1244872,1291848,1292114,1292384,1292725,1292767,1293079,1293828,1293855,1294588,1294909,1294976,1298993,1300805,1300831 +/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006,1241489,1243052,1243058,1244875,1244877,1291871,1292116,1292389,1292726,1292769,1293082,1293935,1294044,1294589,1294914,1294978,1299165,1300806,1300835,1300845 +/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950,1240967,1241482,1243046,1243057,1244870,1244872,1291848,1292114,1292384,1292725,1292767,1293079,1293828,1293855,1294588,1294909,1294976,1298993,1300805,1300826,1300831 Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java?rev=1300853&r1=1300852&r2=1300853&view=diff ============================================================================== --- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java (original) +++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java Thu Mar 15 08:52:51 2012 @@ -149,10 +149,14 @@ public class InterceptSendToEndpoint imp public void start() throws Exception { ServiceHelper.startService(detour); + // here we also need to start the producer + ServiceHelper.startService(producer); } public void stop() throws Exception { // do not stop detour as it should only be stopped when the interceptor stops + // we should stop the producer here + ServiceHelper.stopService(producer); } }; }
