svn commit: r1435821 - in /camel/trunk/components/camel-jms: ./ src/main/java/org/apache/camel/component/jms/DefaultJmsMessageListenerContainer.java

[ra...@apache.org]

Author: raulk
Date: Sun Jan 20 11:24:05 2013
New Revision: 1435821

URL: http://svn.apache.org/viewvc?rev=1435821&view=rev
Log:
CAMEL-5974 Back out r1433767 to intestigate further

Modified:
    camel/trunk/components/camel-jms/   (props changed)
    camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultJmsMessageListenerContainer.java

Propchange: camel/trunk/components/camel-jms/
------------------------------------------------------------------------------
  Reverse-merged /camel/branches/camel-2.10.x/components/camel-jms:r1433765

Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultJmsMessageListenerContainer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultJmsMessageListenerContainer.java?rev=1435821&r1=1435820&r2=1435821&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultJmsMessageListenerContainer.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultJmsMessageListenerContainer.java Sun Jan 20 11:24:05 2013
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.component.jms;
 
-import org.apache.camel.spi.ExecutorServiceManager;
 import org.apache.camel.util.concurrent.CamelThreadFactory;
+import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.jms.listener.DefaultMessageListenerContainer;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 /**
  * The default {@link DefaultMessageListenerContainer container} which listen for messages
@@ -29,7 +28,7 @@ import org.springframework.scheduling.co
  * This implementation extends Springs {@link DefaultMessageListenerContainer} supporting
  * automatic recovery and throttling.
  *
- * @version
+ * @version 
  */
 public class DefaultJmsMessageListenerContainer extends DefaultMessageListenerContainer {
 
@@ -47,26 +46,18 @@ public class DefaultJmsMessageListenerCo
 
     /**
      * Create a default TaskExecutor. Called if no explicit TaskExecutor has been specified.
-     * <p>The default implementation builds a {@link ThreadPoolTaskExecutor} with the following parameters:
-     * <ul>
-     * <li>corePoolSize = concurrentConsumers</li>
-     * <li>maxPoolSize = maxConcurrentConsumers</li>
-     * </ul>
-     * It uses the specified bean name and Camel's {@link org.apache.camel.spi.ExecutorServiceManager}
+     * <p>The default implementation builds a {@link org.springframework.core.task.SimpleAsyncTaskExecutor}
+     * with the specified bean name and using Camel's {@link org.apache.camel.spi.ExecutorServiceManager}
      * to resolve the thread name.
-     * @see ThreadPoolTaskExecutor#setBeanName(String)
+     * @see org.springframework.core.task.SimpleAsyncTaskExecutor#SimpleAsyncTaskExecutor(String)
      */
     @Override
     protected TaskExecutor createDefaultTaskExecutor() {
-        ExecutorServiceManager esm = endpoint.getCamelContext().getExecutorServiceManager();
-        String pattern = esm.getThreadNamePattern();
+        String pattern = endpoint.getCamelContext().getExecutorServiceManager().getThreadNamePattern();
         String beanName = getBeanName();
 
-        ThreadPoolTaskExecutor answer = new ThreadPoolTaskExecutor();
-        answer.setBeanName(beanName);
+        SimpleAsyncTaskExecutor answer = new SimpleAsyncTaskExecutor(beanName);
         answer.setThreadFactory(new CamelThreadFactory(pattern, beanName, true));
-        answer.setCorePoolSize(endpoint.getConcurrentConsumers());
-        answer.setMaxPoolSize(endpoint.getMaxConcurrentConsumers());
         return answer;
     }