Author: davsclaus
Date: Sun Feb 6 15:22:51 2011
New Revision: 1067682
URL: http://svn.apache.org/viewvc?rev=1067682&view=rev
Log:
CAMEL-3576: Don't use task executor for reply manager as spring DMLC is a bit
pants when using thread pools.
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=1067682&r1=1067681&r2=1067682&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
Sun Feb 6 15:22:51 2011
@@ -399,7 +399,8 @@ public class JmsEndpoint extends Default
protected synchronized ScheduledExecutorService
getReplyManagerExecutorService() {
if (replyManagerExecutorService == null) {
- replyManagerExecutorService =
getCamelContext().getExecutorServiceStrategy().newScheduledThreadPool(this,
"JmsReplyManagerTimeoutChecker", 1);
+ String name = "JmsReplyManagerTimeoutChecker[" +
getEndpointConfiguredDestinationName() + "]";
+ replyManagerExecutorService =
getCamelContext().getExecutorServiceStrategy().newScheduledThreadPool(name,
name, 1);
}
return replyManagerExecutorService;
}
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java?rev=1067682&r1=1067681&r2=1067682&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
Sun Feb 6 15:22:51 2011
@@ -18,7 +18,6 @@ package org.apache.camel.component.jms.r
import java.math.BigInteger;
import java.util.Random;
-import java.util.concurrent.ExecutorService;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
@@ -204,13 +203,7 @@ public class PersistentQueueReplyManager
if (endpoint.getRecoveryInterval() >= 0) {
answer.setRecoveryInterval(endpoint.getRecoveryInterval());
}
- if (endpoint.getTaskExecutor() != null) {
- answer.setTaskExecutor(endpoint.getTaskExecutor());
- } else {
- String name = "PersistentReplyManager[" +
endpoint.getEndpointConfiguredDestinationName() + "]";
- ExecutorService executor =
endpoint.getCamelContext().getExecutorServiceStrategy().newSingleThreadExecutor(this,
name);
- answer.setTaskExecutor(executor);
- }
+ // do not use a task executor for reply as we are are always a single
threaded task
return answer;
}
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java?rev=1067682&r1=1067681&r2=1067682&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
Sun Feb 6 15:22:51 2011
@@ -16,9 +16,7 @@
*/
package org.apache.camel.component.jms.reply;
-import java.util.concurrent.ExecutorService;
import javax.jms.Destination;
-import javax.jms.ExceptionListener;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Session;
@@ -26,7 +24,6 @@ import javax.jms.TemporaryQueue;
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
-import org.apache.camel.util.IntrospectionSupport;
import org.springframework.jms.listener.AbstractMessageListenerContainer;
import org.springframework.jms.listener.DefaultMessageListenerContainer;
import org.springframework.jms.support.destination.DestinationResolver;
@@ -121,13 +118,7 @@ public class TemporaryQueueReplyManager
if (endpoint.getRecoveryInterval() >= 0) {
answer.setRecoveryInterval(endpoint.getRecoveryInterval());
}
- if (endpoint.getTaskExecutor() != null) {
- answer.setTaskExecutor(endpoint.getTaskExecutor());
- } else {
- String name = "TemporaryReplyManager[" +
endpoint.getEndpointConfiguredDestinationName() + "]";
- ExecutorService executor =
endpoint.getCamelContext().getExecutorServiceStrategy().newSingleThreadExecutor(this,
name);
- answer.setTaskExecutor(executor);
- }
+ // do not use a task executor for reply as we are are always a single
threaded task
return answer;
}