You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/08/31 11:37:22 UTC
svn commit: r809522 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/impl/DefaultProducerTemplate.java
test/java/org/apache/camel/ContextTestSupport.java
Author: davsclaus
Date: Mon Aug 31 09:37:21 2009
New Revision: 809522
URL: http://svn.apache.org/viewvc?rev=809522&view=rev
Log:
CAMEL-1933: Overhaul of JMX. Improved management of tracer. Added managed scheduled consumer. Restart with executors works better now. Renamed some management classes.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java?rev=809522&r1=809521&r2=809522&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java Mon Aug 31 09:37:21 2009
@@ -54,6 +54,7 @@
public DefaultProducerTemplate(CamelContext context) {
this.context = context;
this.producerCache = new ProducerCache(context.getProducerServicePool());
+ this.executor = ExecutorServiceHelper.newScheduledThreadPool(DEFAULT_THREADPOOL_SIZE, "ProducerTemplate", true);
}
public DefaultProducerTemplate(CamelContext context, ExecutorService executor) {
@@ -672,7 +673,7 @@
@Override
public void start() throws Exception {
super.start();
- if (executor == null) {
+ if (executor == null || executor.isShutdown()) {
executor = ExecutorServiceHelper.newScheduledThreadPool(DEFAULT_THREADPOOL_SIZE, "ProducerTemplate", true);
}
}
@@ -682,8 +683,6 @@
super.stop();
if (executor != null) {
executor.shutdown();
- // must null it so we can restart
- executor = null;
}
}
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java?rev=809522&r1=809521&r2=809522&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java Mon Aug 31 09:37:21 2009
@@ -73,7 +73,9 @@
assertValidContext(context);
template = context.createProducerTemplate();
+ template.start();
consumer = context.createConsumerTemplate();
+ consumer.start();
if (isUseRouteBuilder()) {
RouteBuilder[] builders = createRouteBuilders();