From 333158a031fe2265f0277ddd4e45b4d364233c1c Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Mon, 23 Oct 2006 19:07:10 +0000 Subject: [PATCH] Fixed typo in subscriptionName property name in the ConsumerInfo object. Left the previous getters and setters but deprectaed them. git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@467090 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/activemq/ActiveMQConnection.java | 2 +- .../apache/activemq/ActiveMQInputStream.java | 2 +- .../activemq/ActiveMQMessageConsumer.java | 6 ++-- .../activemq/broker/jmx/BrokerView.java | 2 +- .../broker/jmx/DurableSubscriptionView.java | 2 +- .../broker/jmx/ManagedRegionBroker.java | 4 +-- .../activemq/broker/jmx/SubscriptionView.java | 2 +- .../region/DurableTopicSubscription.java | 2 +- .../activemq/broker/region/TopicRegion.java | 10 +++--- .../apache/activemq/command/ConsumerInfo.java | 31 ++++++++++++++----- .../network/DurableConduitBridge.java | 4 +-- .../activemq/network/ForwardingBridge.java | 2 +- .../openwire/v1/ConsumerInfoMarshaller.java | 10 +++--- .../openwire/v2/ConsumerInfoMarshaller.java | 10 +++--- .../apache/activemq/broker/BrokerTest.java | 8 ++--- .../activemq/broker/RecoveryBrokerTest.java | 4 +-- .../openwire/v1/ConsumerInfoTest.java | 2 +- .../openwire/v2/ConsumerInfoTest.java | 2 +- 18 files changed, 61 insertions(+), 44 deletions(-) diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java index 6ea040c58c..02de32cceb 100755 --- a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java @@ -678,7 +678,7 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon ConsumerInfo info = new ConsumerInfo(new ConsumerId(sessionId, consumerIdGenerator .getNextSequenceId())); info.setDestination(ActiveMQMessageTransformation.transformDestination(topic)); - info.setSubcriptionName(subscriptionName); + info.setSubscriptionName(subscriptionName); info.setSelector(messageSelector); info.setPrefetchSize(maxMessages); info.setDispatchAsync(dispatchAsync); diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java index c1576cec48..e1ac19cf09 100644 --- a/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java @@ -84,7 +84,7 @@ public class ActiveMQInputStream extends InputStream implements ActiveMQDispatch } this.info = new ConsumerInfo(consumerId); - this.info.setSubcriptionName(name); + this.info.setSubscriptionName(name); if (selector != null && selector.trim().length() != 0) { selector = "JMSType='org.apache.activemq.Stream' AND ( "+selector+" ) "; diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java index bdc2bc410e..db072db337 100755 --- a/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java +++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java @@ -164,7 +164,7 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC this.redeliveryPolicy = session.connection.getRedeliveryPolicy(); this.info = new ConsumerInfo(consumerId); - this.info.setSubcriptionName(name); + this.info.setSubscriptionName(name); this.info.setPrefetchSize(prefetch); this.info.setCurrentPrefetchSize(prefetch); this.info.setMaximumPendingMessageLimit(maximumPendingMessageCount); @@ -234,7 +234,7 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC * @return the consumer name - used for durable consumers */ protected String getConsumerName() { - return this.info.getSubcriptionName(); + return this.info.getSubscriptionName(); } /** @@ -271,7 +271,7 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC * @return true if this is a durable topic subscriber */ public boolean isDurableSubscriber() { - return info.getSubcriptionName()!=null && info.getDestination().isTopic(); + return info.getSubscriptionName()!=null && info.getDestination().isTopic(); } /** diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java index dc1e3dfa9e..595715dc6b 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java @@ -163,7 +163,7 @@ public class BrokerView implements BrokerViewMBean { consumerId.setValue(0); info.setConsumerId(consumerId); info.setDestination(new ActiveMQTopic(topicName)); - info.setSubcriptionName(subscriberName); + info.setSubscriptionName(subscriberName); info.setSelector(selector); Subscription subscription = broker.addConsumer(context, info); broker.removeConsumer(context, info); diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java index a95657f4c1..c81ef26f7a 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java @@ -39,7 +39,7 @@ public class DurableSubscriptionView extends SubscriptionView implements Durabl public DurableSubscriptionView(ManagedRegionBroker broker,String clientId,Subscription sub){ super(clientId,sub); this.broker = broker; - this.subscriptionName = sub.getConsumerInfo().getSubcriptionName(); + this.subscriptionName = sub.getConsumerInfo().getSubscriptionName(); } /** diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java index 41be5adcb9..8079275612 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java @@ -180,10 +180,10 @@ public class ManagedRegionBroker extends RegionBroker { String clientId="clientId="+JMXSupport.encodeObjectNamePart(context.getClientId()); String persistentMode="persistentMode="; String consumerId=""; - SubscriptionKey key=new SubscriptionKey(context.getClientId(),sub.getConsumerInfo().getSubcriptionName()); + SubscriptionKey key=new SubscriptionKey(context.getClientId(),sub.getConsumerInfo().getSubscriptionName()); if(sub.getConsumerInfo().isDurable()){ persistentMode+="Durable, subscriptionID=" - +JMXSupport.encodeObjectNamePart(sub.getConsumerInfo().getSubcriptionName()); + +JMXSupport.encodeObjectNamePart(sub.getConsumerInfo().getSubscriptionName()); }else{ persistentMode+="Non-Durable"; if(sub.getConsumerInfo()!=null&&sub.getConsumerInfo().getConsumerId()!=null){ diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java index a32e334cad..bf2b95fdd6 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java @@ -221,7 +221,7 @@ public class SubscriptionView implements SubscriptionViewMBean { */ public String getSubcriptionName() { ConsumerInfo info = getConsumerInfo(); - return info != null ? info.getSubcriptionName() : null; + return info != null ? info.getSubscriptionName() : null; } /** diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java index 366faf677d..d900aa26c1 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java @@ -44,7 +44,7 @@ public class DurableTopicSubscription extends PrefetchSubscription { public DurableTopicSubscription(Broker broker,ConnectionContext context, ConsumerInfo info, boolean keepDurableSubsActive,PendingMessageCursor cursor) throws InvalidSelectorException { super(broker,context,info,cursor); this.keepDurableSubsActive = keepDurableSubsActive; - subscriptionKey = new SubscriptionKey(context.getClientId(), info.getSubcriptionName()); + subscriptionKey = new SubscriptionKey(context.getClientId(), info.getSubscriptionName()); } synchronized public boolean isActive() { diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java index 087b0b80a7..3ee05ac106 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java @@ -70,7 +70,7 @@ public class TopicRegion extends AbstractRegion { lookup(context,destination); } String clientId=context.getClientId(); - String subcriptionName=info.getSubcriptionName(); + String subcriptionName=info.getSubscriptionName(); SubscriptionKey key=new SubscriptionKey(clientId,subcriptionName); DurableTopicSubscription sub=(DurableTopicSubscription)durableSubscriptions.get(key); if(sub!=null){ @@ -114,7 +114,7 @@ public class TopicRegion extends AbstractRegion { public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Exception { if (info.isDurable()) { - SubscriptionKey key = new SubscriptionKey(context.getClientId(), info.getSubcriptionName()); + SubscriptionKey key = new SubscriptionKey(context.getClientId(), info.getSubscriptionName()); DurableTopicSubscription sub = (DurableTopicSubscription) durableSubscriptions.get(key); if (sub != null) { sub.deactivate(keepDurableSubsActive); @@ -189,7 +189,7 @@ public class TopicRegion extends AbstractRegion { private ConsumerInfo createInactiveConsumerInfo(SubscriptionInfo info) { ConsumerInfo rc = new ConsumerInfo(); rc.setSelector(info.getSelector()); - rc.setSubcriptionName(info.getSubcriptionName()); + rc.setSubscriptionName(info.getSubcriptionName()); rc.setDestination(info.getDestination()); rc.setConsumerId(createConsumerId()); return rc; @@ -213,11 +213,11 @@ public class TopicRegion extends AbstractRegion { if (AdvisorySupport.isAdvisoryTopic(info.getDestination())){ throw new JMSException("Cannot create a durable subscription for an advisory Topic"); } - SubscriptionKey key = new SubscriptionKey(context.getClientId(), info.getSubcriptionName()); + SubscriptionKey key = new SubscriptionKey(context.getClientId(), info.getSubscriptionName()); DurableTopicSubscription sub = (DurableTopicSubscription) durableSubscriptions.get(key); if(sub==null){ PendingMessageCursor cursor=broker.getPendingDurableSubscriberPolicy().getSubscriberPendingMessageCursor( - context.getClientId(),info.getSubcriptionName(),broker.getTempDataStore(), + context.getClientId(),info.getSubscriptionName(),broker.getTempDataStore(), info.getPrefetchSize()); sub=new DurableTopicSubscription(broker,context,info,keepDurableSubsActive,cursor); durableSubscriptions.put(key,sub); diff --git a/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java b/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java index 942627aeab..4e17bbcc35 100755 --- a/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java +++ b/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java @@ -43,7 +43,7 @@ public class ConsumerInfo extends BaseCommand { protected boolean browser; protected boolean dispatchAsync; protected String selector; - protected String subcriptionName; + protected String subscriptionName; protected boolean noLocal; protected boolean exclusive; protected boolean retroactive; @@ -82,7 +82,7 @@ public class ConsumerInfo extends BaseCommand { info.browser = browser; info.dispatchAsync = dispatchAsync; info.selector = selector; - info.subcriptionName=subcriptionName; + info.subscriptionName=subscriptionName; info.noLocal = noLocal; info.exclusive = exclusive; info.retroactive = retroactive; @@ -91,7 +91,7 @@ public class ConsumerInfo extends BaseCommand { } public boolean isDurable() { - return subcriptionName!=null; + return subscriptionName!=null; } public byte getDataStructureType() { @@ -197,13 +197,30 @@ public class ConsumerInfo extends BaseCommand { * * @openwire:property version=1 */ + public String getSubscriptionName() { + return subscriptionName; + } + public void setSubscriptionName(String durableSubscriptionId) { + this.subscriptionName = durableSubscriptionId; + } + + /** + * @deprecated + * @return @see getSubscriptionName + */ public String getSubcriptionName() { - return subcriptionName; + return subscriptionName; } + + /** + * @deprecated + * @see setSubscriptionName + * @param durableSubscriptionId + */ public void setSubcriptionName(String durableSubscriptionId) { - this.subcriptionName = durableSubscriptionId; - } - + this.subscriptionName = durableSubscriptionId; + } + /** * Set noLocal to true to avoid receiving messages that were published locally on the same connection. * diff --git a/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java index 4fd6b6b77a..72b57b5968 100644 --- a/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java @@ -58,7 +58,7 @@ public class DurableConduitBridge extends ConduitBridge{ if(isPermissableDestination(dest) && !doesConsumerExist(dest)){ DemandSubscription sub=createDemandSubscription(dest); if(dest.isTopic()){ - sub.getLocalInfo().setSubcriptionName(getSubscriberName(dest)); + sub.getLocalInfo().setSubscriptionName(getSubscriberName(dest)); } try{ addSubscription(sub); @@ -86,7 +86,7 @@ public class DurableConduitBridge extends ConduitBridge{ if(info.isDurable()){ // set the subscriber name to something reproducible - info.setSubcriptionName(getSubscriberName(info.getDestination())); + info.setSubscriptionName(getSubscriberName(info.getDestination())); } return doCreateDemandSubscription(info); } diff --git a/activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java index 7694c80848..ceffbee07e 100755 --- a/activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java @@ -151,7 +151,7 @@ public class ForwardingBridge implements Bridge { if( connectionInfo.getClientId()!=null ) { topicConsumerInfo = new ConsumerInfo(sessionInfo, 2); topicConsumerInfo.setDispatchAsync(dispatchAsync); - topicConsumerInfo.setSubcriptionName("topic-bridge"); + topicConsumerInfo.setSubscriptionName("topic-bridge"); topicConsumerInfo.setRetroactive(true); topicConsumerInfo.setDestination(new ActiveMQTopic(destinationFilter)); topicConsumerInfo.setPrefetchSize(prefetchSize); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java index 5ac21476b0..e1c75e8b74 100755 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java @@ -73,7 +73,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { info.setMaximumPendingMessageLimit(dataIn.readInt()); info.setDispatchAsync(bs.readBoolean()); info.setSelector(tightUnmarshalString(dataIn, bs)); - info.setSubcriptionName(tightUnmarshalString(dataIn, bs)); + info.setSubscriptionName(tightUnmarshalString(dataIn, bs)); info.setNoLocal(bs.readBoolean()); info.setExclusive(bs.readBoolean()); info.setRetroactive(bs.readBoolean()); @@ -111,7 +111,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); bs.writeBoolean(info.isDispatchAsync()); rc += tightMarshalString1(info.getSelector(), bs); - rc += tightMarshalString1(info.getSubcriptionName(), bs); + rc += tightMarshalString1(info.getSubscriptionName(), bs); bs.writeBoolean(info.isNoLocal()); bs.writeBoolean(info.isExclusive()); bs.writeBoolean(info.isRetroactive()); @@ -142,7 +142,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { dataOut.writeInt(info.getMaximumPendingMessageLimit()); bs.readBoolean(); tightMarshalString2(info.getSelector(), dataOut, bs); - tightMarshalString2(info.getSubcriptionName(), dataOut, bs); + tightMarshalString2(info.getSubscriptionName(), dataOut, bs); bs.readBoolean(); bs.readBoolean(); bs.readBoolean(); @@ -173,7 +173,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { info.setMaximumPendingMessageLimit(dataIn.readInt()); info.setDispatchAsync(dataIn.readBoolean()); info.setSelector(looseUnmarshalString(dataIn)); - info.setSubcriptionName(looseUnmarshalString(dataIn)); + info.setSubscriptionName(looseUnmarshalString(dataIn)); info.setNoLocal(dataIn.readBoolean()); info.setExclusive(dataIn.readBoolean()); info.setRetroactive(dataIn.readBoolean()); @@ -213,7 +213,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { dataOut.writeInt(info.getMaximumPendingMessageLimit()); dataOut.writeBoolean(info.isDispatchAsync()); looseMarshalString(info.getSelector(), dataOut); - looseMarshalString(info.getSubcriptionName(), dataOut); + looseMarshalString(info.getSubscriptionName(), dataOut); dataOut.writeBoolean(info.isNoLocal()); dataOut.writeBoolean(info.isExclusive()); dataOut.writeBoolean(info.isRetroactive()); diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java index 50d7ee8d86..404c9898d0 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v2/ConsumerInfoMarshaller.java @@ -73,7 +73,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { info.setMaximumPendingMessageLimit(dataIn.readInt()); info.setDispatchAsync(bs.readBoolean()); info.setSelector(tightUnmarshalString(dataIn, bs)); - info.setSubcriptionName(tightUnmarshalString(dataIn, bs)); + info.setSubscriptionName(tightUnmarshalString(dataIn, bs)); info.setNoLocal(bs.readBoolean()); info.setExclusive(bs.readBoolean()); info.setRetroactive(bs.readBoolean()); @@ -111,7 +111,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); bs.writeBoolean(info.isDispatchAsync()); rc += tightMarshalString1(info.getSelector(), bs); - rc += tightMarshalString1(info.getSubcriptionName(), bs); + rc += tightMarshalString1(info.getSubscriptionName(), bs); bs.writeBoolean(info.isNoLocal()); bs.writeBoolean(info.isExclusive()); bs.writeBoolean(info.isRetroactive()); @@ -142,7 +142,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { dataOut.writeInt(info.getMaximumPendingMessageLimit()); bs.readBoolean(); tightMarshalString2(info.getSelector(), dataOut, bs); - tightMarshalString2(info.getSubcriptionName(), dataOut, bs); + tightMarshalString2(info.getSubscriptionName(), dataOut, bs); bs.readBoolean(); bs.readBoolean(); bs.readBoolean(); @@ -173,7 +173,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { info.setMaximumPendingMessageLimit(dataIn.readInt()); info.setDispatchAsync(dataIn.readBoolean()); info.setSelector(looseUnmarshalString(dataIn)); - info.setSubcriptionName(looseUnmarshalString(dataIn)); + info.setSubscriptionName(looseUnmarshalString(dataIn)); info.setNoLocal(dataIn.readBoolean()); info.setExclusive(dataIn.readBoolean()); info.setRetroactive(dataIn.readBoolean()); @@ -213,7 +213,7 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { dataOut.writeInt(info.getMaximumPendingMessageLimit()); dataOut.writeBoolean(info.isDispatchAsync()); looseMarshalString(info.getSelector(), dataOut); - looseMarshalString(info.getSubcriptionName(), dataOut); + looseMarshalString(info.getSubscriptionName(), dataOut); dataOut.writeBoolean(info.isNoLocal()); dataOut.writeBoolean(info.isExclusive()); dataOut.writeBoolean(info.isRetroactive()); diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java index 5bc7d3303c..1d13f716ba 100755 --- a/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java @@ -329,7 +329,7 @@ public class BrokerTest extends BrokerTestSupport { ConsumerInfo consumerInfo1 = createConsumerInfo(sessionInfo1, destination); consumerInfo1.setPrefetchSize(100); - consumerInfo1.setSubcriptionName("test"); + consumerInfo1.setSubscriptionName("test"); connection1.send(consumerInfo1); // Send the messages @@ -357,7 +357,7 @@ public class BrokerTest extends BrokerTestSupport { SessionInfo sessionInfo2 = createSessionInfo(connectionInfo2); ConsumerInfo consumerInfo2 = createConsumerInfo(sessionInfo2, destination); consumerInfo2.setPrefetchSize(100); - consumerInfo2.setSubcriptionName("test"); + consumerInfo2.setSubscriptionName("test"); connection2.send(connectionInfo2); connection2.send(sessionInfo2); @@ -462,7 +462,7 @@ public class BrokerTest extends BrokerTestSupport { // Create the durable subscription. ConsumerInfo consumerInfo1 = createConsumerInfo(sessionInfo1, destination); if( durableConsumer ) { - consumerInfo1.setSubcriptionName("test"); + consumerInfo1.setSubscriptionName("test"); } consumerInfo1.setPrefetchSize(100); connection1.send(consumerInfo1); @@ -511,7 +511,7 @@ public class BrokerTest extends BrokerTestSupport { // Create the durable subscription. ConsumerInfo consumerInfo1 = createConsumerInfo(sessionInfo1, destination); if( durableConsumer ) { - consumerInfo1.setSubcriptionName("test"); + consumerInfo1.setSubscriptionName("test"); } consumerInfo1.setPrefetchSize(100); consumerInfo1.setRetroactive(true); diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java index 06d67713f1..0ada1ff605 100755 --- a/activemq-core/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java @@ -140,7 +140,7 @@ public class RecoveryBrokerTest extends BrokerRestartTestSupport { // Create the durable subscription. ConsumerInfo consumerInfo1 = createConsumerInfo(sessionInfo1, destination); - consumerInfo1.setSubcriptionName("test"); + consumerInfo1.setSubscriptionName("test"); consumerInfo1.setPrefetchSize(100); connection1.send(consumerInfo1); @@ -166,7 +166,7 @@ public class RecoveryBrokerTest extends BrokerRestartTestSupport { // Re-open the subscription. ConsumerInfo consumerInfo2 = createConsumerInfo(sessionInfo2, destination); - consumerInfo2.setSubcriptionName("test"); + consumerInfo2.setSubscriptionName("test"); consumerInfo2.setPrefetchSize(100); connection2.send(consumerInfo2); diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java index e66f4b55da..9cc131b7a2 100644 --- a/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java @@ -58,7 +58,7 @@ public class ConsumerInfoTest extends BaseCommandTestSupport { info.setMaximumPendingMessageLimit(2); info.setDispatchAsync(false); info.setSelector("Selector:3"); - info.setSubcriptionName("SubcriptionName:4"); + info.setSubscriptionName("SubcriptionName:4"); info.setNoLocal(true); info.setExclusive(false); info.setRetroactive(true); diff --git a/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java b/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java index b6934b83fa..ae0f5f1855 100644 --- a/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java @@ -58,7 +58,7 @@ public class ConsumerInfoTest extends BaseCommandTestSupport { info.setMaximumPendingMessageLimit(2); info.setDispatchAsync(false); info.setSelector("Selector:3"); - info.setSubcriptionName("SubcriptionName:4"); + info.setSubscriptionName("SubcriptionName:4"); info.setNoLocal(true); info.setExclusive(false); info.setRetroactive(true);