Author: ningjiang
Date: Thu Mar 15 08:41:32 2012
New Revision: 1300845
URL: http://svn.apache.org/viewvc?rev=1300845&view=rev
Log:
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.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
camel/branches/camel-2.9.x/components/camel-solr/ (props changed)
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 08:41:32 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073,1295108,1295120,1296653,1296790,1298125,1298155,1298447,1298795,1298821,1298993,1299383,1299399,1300720-1300722,1300805,1300831
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073,1295108,1295120,1296653,1296790,1298125,1298155,1298447,1298795,1298821,1298993,1299383,1299399,1300720-1300722,1300805,1300826,1300831
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java?rev=1300845&r1=1300844&r2=1300845&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
Thu Mar 15 08:41:32 2012
@@ -153,10 +153,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);
}
};
}
Propchange: camel/branches/camel-2.9.x/components/camel-solr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 08:41:32 2012
@@ -1 +1 @@
-/camel/trunk/components/camel-solr:1227197-1298579,1298795,1298821,1298993,1299399,1300805,1300831
+/camel/trunk/components/camel-solr:1227197-1298579,1298795,1298821,1298993,1299399,1300805,1300826,1300831
