You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/11/14 21:30:17 UTC
svn commit: r1201879 - in /camel/branches/camel-2.8.x: ./
components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/
Author: dkulp
Date: Mon Nov 14 20:30:16 2011
New Revision: 1201879
URL: http://svn.apache.org/viewvc?rev=1201879&view=rev
Log:
Merged revisions 1199803 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1199803 | davsclaus | 2011-11-09 10:40:28 -0500 (Wed, 09 Nov 2011) | 1 line
CAMEL-4651: Setup a bean name on DMLC in reply manager so it has a Camel related thread name
........
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/reply/PersistentQueueReplyManager.java
camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
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/reply/PersistentQueueReplyManager.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java?rev=1201879&r1=1201878&r2=1201879&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java (original)
+++ camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java Mon Nov 14 20:30:16 2011
@@ -154,6 +154,7 @@ public class PersistentQueueReplyManager
answer.setPubSubDomain(false);
answer.setSubscriptionDurable(false);
answer.setConcurrentConsumers(1);
+ answer.setMaxConcurrentConsumers(1);
answer.setConnectionFactory(endpoint.getConnectionFactory());
String clientId = endpoint.getClientId();
if (clientId != null) {
@@ -181,6 +182,11 @@ public class PersistentQueueReplyManager
}
// do not use a task executor for reply as we are are always a single threaded task
+ // setup a bean name which is used ny Spring JMS as the thread name
+ String name = "PersistentQueueReplyManager[" + answer.getDestinationName() + "]";
+ name = endpoint.getCamelContext().getExecutorServiceManager().resolveThreadName(name);
+ answer.setBeanName(name);
+
return answer;
}
Modified: camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java?rev=1201879&r1=1201878&r2=1201879&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java (original)
+++ camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java Mon Nov 14 20:30:16 2011
@@ -96,6 +96,7 @@ public class TemporaryQueueReplyManager
answer.setPubSubDomain(false);
answer.setSubscriptionDurable(false);
answer.setConcurrentConsumers(1);
+ answer.setMaxConcurrentConsumers(1);
answer.setConnectionFactory(endpoint.getConnectionFactory());
String clientId = endpoint.getClientId();
if (clientId != null) {
@@ -121,6 +122,11 @@ public class TemporaryQueueReplyManager
}
// do not use a task executor for reply as we are are always a single threaded task
+ // setup a bean name which is used ny Spring JMS as the thread name
+ String name = "TemporaryQueueReplyManager[" + answer.getDestinationName() + "]";
+ name = endpoint.getCamelContext().getExecutorServiceManager().resolveThreadName(name);
+ answer.setBeanName(name);
+
return answer;
}