Author: dkulp
Date: Fri Jul 8 19:18:30 2011
New Revision: 1144427
URL: http://svn.apache.org/viewvc?rev=1144427&view=rev
Log:
Merged revisions 1144248 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1144248 | davsclaus | 2011-07-08 06:52:02 -0400 (Fri, 08 Jul 2011) | 1 line
CAMEL-4194: jmx topic endpoints should be non-singleton.
........
Added:
camel/branches/camel-2.7.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
- copied unchanged from r1144248,
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 19:18:30 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1083723-1083724,1084150,1085905,1085909,1086231,1087005,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144324
+/camel/trunk:1083696,1083723-1083724,1084150,1085905,1085909,1086231,1087005,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=1144427&r1=1144426&r2=1144427&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
Fri Jul 8 19:18:30 2011
@@ -322,6 +322,12 @@ public class JmsEndpoint extends Default
@ManagedAttribute
public boolean isSingleton() {
+ if (isPubSubDomain()) {
+ // topic cannot be singleton, as there may be multiple consumers
+ // on the same topic
+ return false;
+ }
+ // but queues can be singleton
return true;
}
