You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ra...@apache.org on 2007/07/30 22:36:17 UTC
svn commit: r561109 - in
/activemq/trunk/activemq-core/src/main/java/org/apache/activemq:
broker/jmx/ broker/region/ command/ store/kahadaptor/ util/
Author: rajdavies
Date: Mon Jul 30 13:36:16 2007
New Revision: 561109
URL: http://svn.apache.org/viewvc?view=rev&rev=561109
Log:
Fix for https://issues.apache.org/activemq/browse/AMQ-1305
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/InactiveDurableSubscriptionView.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/SubscriptionInfo.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStoreAdapter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/SubscriptionKey.java
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/InactiveDurableSubscriptionView.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/InactiveDurableSubscriptionView.java?view=diff&rev=561109&r1=561108&r2=561109
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/InactiveDurableSubscriptionView.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/InactiveDurableSubscriptionView.java Mon Jul 30 13:36:16 2007
@@ -89,7 +89,7 @@
* @return name of the durable consumer
*/
public String getSubscriptionName(){
- return subscriptionInfo.getSubcriptionName();
+ return subscriptionInfo.getSubscriptionName();
}
/**
@@ -125,7 +125,7 @@
public void destroy() throws Exception {
RemoveSubscriptionInfo info = new RemoveSubscriptionInfo();
info.setClientId(clientId);
- info.setSubcriptionName(subscriptionInfo.getSubcriptionName());
+ info.setSubcriptionName(subscriptionInfo.getSubscriptionName());
ConnectionContext context = new ConnectionContext();
context.setBroker(broker);
context.setClientId(clientId);
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java?view=diff&rev=561109&r1=561108&r2=561109
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java Mon Jul 30 13:36:16 2007
@@ -70,13 +70,13 @@
lookup(context,destination);
}
String clientId=context.getClientId();
- String subcriptionName=info.getSubscriptionName();
- SubscriptionKey key=new SubscriptionKey(clientId,subcriptionName);
+ String subscriptionName=info.getSubscriptionName();
+ SubscriptionKey key=new SubscriptionKey(clientId,subscriptionName);
DurableTopicSubscription sub=(DurableTopicSubscription)durableSubscriptions.get(key);
if(sub!=null){
if(sub.isActive()){
throw new JMSException("Durable consumer is in use for client: "+clientId+" and subscriptionName: "
- +subcriptionName);
+ +subscriptionName);
}
// Has the selector changed??
if(hasDurableSubChanged(info,sub.getConsumerInfo())){
@@ -189,7 +189,7 @@
private ConsumerInfo createInactiveConsumerInfo(SubscriptionInfo info) {
ConsumerInfo rc = new ConsumerInfo();
rc.setSelector(info.getSelector());
- rc.setSubscriptionName(info.getSubcriptionName());
+ rc.setSubscriptionName(info.getSubscriptionName());
rc.setDestination(info.getDestination());
rc.setConsumerId(createConsumerId());
return rc;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java?view=diff&rev=561109&r1=561108&r2=561109
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java Mon Jul 30 13:36:16 2007
@@ -30,7 +30,7 @@
protected ConnectionId connectionId;
protected String clientId;
- protected String subcriptionName;
+ protected String subscriptionName;
public byte getDataStructureType() {
@@ -49,13 +49,25 @@
/**
* @openwire:property version=1
+ * @deprecated
*/
public String getSubcriptionName() {
- return subcriptionName;
+ return subscriptionName;
}
- public void setSubcriptionName(String subcriptionName) {
- this.subcriptionName = subcriptionName;
+ /**
+ * @deprecated
+ */
+ public void setSubcriptionName(String subscriptionName) {
+ this.subscriptionName = subscriptionName;
+ }
+
+ public String getSubscriptionName() {
+ return subscriptionName;
+ }
+
+ public void setSubscriptionName(String subscriptionName) {
+ this.subscriptionName = subscriptionName;
}
/**
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/SubscriptionInfo.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/SubscriptionInfo.java?view=diff&rev=561109&r1=561108&r2=561109
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/SubscriptionInfo.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/SubscriptionInfo.java Mon Jul 30 13:36:16 2007
@@ -31,7 +31,7 @@
protected ActiveMQDestination destination;
protected String clientId;
- protected String subcriptionName;
+ protected String subscriptionName;
protected String selector;
public byte getDataStructureType() {
@@ -73,13 +73,26 @@
/**
* @openwire:property version=1
+ * @deprecated
*/
public String getSubcriptionName() {
- return subcriptionName;
+ return subscriptionName;
}
- public void setSubcriptionName(String subcriptionName) {
- this.subcriptionName = subcriptionName;
+ /**
+ * @param subscriptionName
+ * * @deprecated
+ */
+ public void setSubcriptionName(String subscriptionName) {
+ this.subscriptionName = subscriptionName;
+ }
+
+ public String getSubscriptionName() {
+ return subscriptionName;
+ }
+
+ public void setSubscriptionName(String subscriptionName) {
+ this.subscriptionName = subscriptionName;
}
public boolean isMarshallAware() {
@@ -92,7 +105,7 @@
public int hashCode() {
int h1 = clientId != null ? clientId.hashCode():-1;
- int h2 = subcriptionName != null ? subcriptionName.hashCode():-1;
+ int h2 = subscriptionName != null ? subscriptionName.hashCode():-1;
return h1 ^ h2;
}
@@ -102,8 +115,8 @@
SubscriptionInfo other=(SubscriptionInfo)obj;
result=(clientId==null&&other.clientId==null||clientId!=null&&other.clientId!=null
&&clientId.equals(other.clientId))
- &&(subcriptionName==null&&other.subcriptionName==null||subcriptionName!=null
- &&other.subcriptionName!=null&&subcriptionName.equals(other.subcriptionName));
+ &&(subscriptionName==null&&other.subscriptionName==null||subscriptionName!=null
+ &&other.subscriptionName!=null&&subscriptionName.equals(other.subscriptionName));
}
return result;
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStoreAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStoreAdapter.java?view=diff&rev=561109&r1=561108&r2=561109
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStoreAdapter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStoreAdapter.java Mon Jul 30 13:36:16 2007
@@ -211,7 +211,7 @@
for(Iterator i=durableSubscribers.iterator();i.hasNext();){
SubscriptionInfo info=(SubscriptionInfo)i.next();
TopicReferenceStore ts=createTopicReferenceStore((ActiveMQTopic)info.getDestination());
- ts.addSubsciption(info.getClientId(),info.getSubcriptionName(),info.getSelector(),false);
+ ts.addSubsciption(info.getClientId(),info.getSubscriptionName(),info.getSelector(),false);
}
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/SubscriptionKey.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/SubscriptionKey.java?view=diff&rev=561109&r1=561108&r2=561109
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/SubscriptionKey.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/SubscriptionKey.java Mon Jul 30 13:36:16 2007
@@ -27,7 +27,7 @@
public SubscriptionKey(SubscriptionInfo info) {
- this(info.getClientId(), info.getSubcriptionName());
+ this(info.getClientId(), info.getSubscriptionName());
}
public SubscriptionKey(String clientId, String subscriptionName) {