Author: rajdavies
Date: Mon Apr 10 10:18:21 2006
New Revision: 392992
URL: http://svn.apache.org/viewcvs?rev=392992&view=rev
Log:
fix for https://issues.apache.org/activemq/browse/AMQ-687
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java?rev=392992&r1=392991&r2=392992&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java
Mon Apr 10 10:18:21 2006
@@ -54,7 +54,7 @@
if(isPermissableDestination(dest) && !doesConsumerExist(dest)){
DemandSubscription sub=createDemandSubscription(dest);
if(dest.isTopic()){
-
sub.getLocalInfo().setSubcriptionName(getLocalBrokerName()+"_"+name);
+
sub.getLocalInfo().setSubcriptionName(getSubscriberName(dest));
}
try{
addSubscription(sub);
@@ -81,9 +81,15 @@
}
if(info.isDurable()){
// set the subscriber name to something reproducible
- info.setSubcriptionName(getLocalBrokerName());
+
+ info.setSubcriptionName(getSubscriberName(info.getDestination()));
}
return doCreateDemandSubscription(info);
+ }
+
+ protected String getSubscriberName(ActiveMQDestination dest){
+ String subscriberName =
getLocalBrokerName()+"_"+dest.getPhysicalName();
+ return subscriberName;
}
protected boolean doesConsumerExist(ActiveMQDestination dest){
