You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2011/10/31 21:25:14 UTC
svn commit: r1195652 - in /camel/branches/camel-2.8.x: ./
components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
Author: janstey
Date: Mon Oct 31 20:25:14 2011
New Revision: 1195652
URL: http://svn.apache.org/viewvc?rev=1195652&view=rev
Log:
Merged revisions 1195616 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1195616 | janstey | 2011-10-31 16:27:56 -0230 (Mon, 31 Oct 2011) | 3 lines
[CAMEL-4599] - Add default for transactionName in camel-jms
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 31 20:25:14 2011
@@ -1 +1 @@
-/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879,1188881,1189600,1189681,1189693,1189737,1190212-1190213,1190246,1190303,1195317
+/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879,1188881,1189600,1189681,1189693,1189737,1190212-1190213,1190246,1190303,1195317,1195616
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=1195652&r1=1195651&r2=1195652&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java (original)
+++ camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java Mon Oct 31 20:25:14 2011
@@ -184,18 +184,26 @@ public class JmsEndpoint extends Default
}
listenerContainer.setPubSubDomain(pubSubDomain);
+ // include destination name as part of thread and transaction name
+ String consumerName = "JmsConsumer[" + getEndpointConfiguredDestinationName() + "]";
+
if (configuration.getTaskExecutor() != null) {
if (log.isDebugEnabled()) {
log.debug("Using custom TaskExecutor: {} on listener container: {}", configuration.getTaskExecutor(), listenerContainer);
}
setContainerTaskExecutor(listenerContainer, configuration.getTaskExecutor());
} else {
- // include destination name as part of thread name
- String name = "JmsConsumer[" + getEndpointConfiguredDestinationName() + "]";
// use a cached pool as DefaultMessageListenerContainer will throttle pool sizing
- ExecutorService executor = getCamelContext().getExecutorServiceStrategy().newCachedThreadPool(consumer, name);
+ ExecutorService executor = getCamelContext().getExecutorServiceStrategy().newCachedThreadPool(consumer, consumerName);
setContainerTaskExecutor(listenerContainer, executor);
}
+
+ // set a default transaction name if none provided
+ if (configuration.getTransactionName() == null) {
+ if (listenerContainer instanceof DefaultMessageListenerContainer) {
+ ((DefaultMessageListenerContainer) listenerContainer).setTransactionName(consumerName);
+ }
+ }
}
private void setContainerTaskExecutor(AbstractMessageListenerContainer listenerContainer, Executor executor) {