AMQ-4885: Renamed some API methods in MessageStore due typos.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/351f05e2 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/351f05e2 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/351f05e2 Branch: refs/heads/activemq-5.9 Commit: 351f05e268a4521f09ed8045ea4fa4daf0b71bc8 Parents: 43c3b48 Author: Claus Ibsen <[email protected]> Authored: Fri Nov 22 11:21:42 2013 +0100 Committer: Hadrian Zbarcea <[email protected]> Committed: Wed Mar 12 12:10:51 2014 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/activemq/broker/region/Topic.java | 2 +- .../src/main/java/org/apache/activemq/store/MessageStore.java | 4 ++-- .../java/org/apache/activemq/store/ProxyTopicMessageStore.java | 4 ++-- .../main/java/org/apache/activemq/store/TopicMessageStore.java | 2 +- .../apache/activemq/store/memory/MemoryTopicMessageStore.java | 2 +- .../org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java | 2 +- .../apache/activemq/store/journal/JournalTopicMessageStore.java | 4 ++-- .../main/java/org/apache/activemq/store/kahadb/KahaDBStore.java | 4 ++-- .../java/org/apache/activemq/store/kahadb/TempKahaDBStore.java | 4 ++-- .../main/scala/org/apache/activemq/leveldb/LevelDBStore.scala | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/351f05e2/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java index 328410c..41eef60 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java @@ -255,7 +255,7 @@ public class Topic extends BaseDestination implements Task { // This destination might be a pattern synchronized (consumers) { consumers.add(subscription); - topicStore.addSubsciption(info, subscription.getConsumerInfo().isRetroactive()); + topicStore.addSubscription(info, subscription.getConsumerInfo().isRetroactive()); } } http://git-wip-us.apache.org/repos/asf/activemq/blob/351f05e2/activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java index b519718..6dac804 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java +++ b/activemq-broker/src/main/java/org/apache/activemq/store/MessageStore.java @@ -147,10 +147,10 @@ public interface MessageStore extends Service { ActiveMQDestination getDestination(); /** - * @param memoeyUSage The SystemUsage that is controlling the + * @param memoryUsage The SystemUsage that is controlling the * destination's memory usage. */ - void setMemoryUsage(MemoryUsage memoeyUSage); + void setMemoryUsage(MemoryUsage memoryUsage); /** * @return the number of messages ready to deliver http://git-wip-us.apache.org/repos/asf/activemq/blob/351f05e2/activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java index 00e5150..8487650 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java +++ b/activemq-broker/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java @@ -94,8 +94,8 @@ public class ProxyTopicMessageStore implements TopicMessageStore { } @Override - public void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { - delegate.addSubsciption(subscriptionInfo, retroactive); + public void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { + delegate.addSubscription(subscriptionInfo, retroactive); } @Override http://git-wip-us.apache.org/repos/asf/activemq/blob/351f05e2/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java index 24f5b0c..0343c11 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java +++ b/activemq-broker/src/main/java/org/apache/activemq/store/TopicMessageStore.java @@ -129,5 +129,5 @@ public interface TopicMessageStore extends MessageStore { * @param retroactive * @throws IOException */ - void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException; + void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException; } http://git-wip-us.apache.org/repos/asf/activemq/blob/351f05e2/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java index 023d9eb..0debfe6 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java +++ b/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java @@ -80,7 +80,7 @@ public class MemoryTopicMessageStore extends MemoryMessageStore implements Topic return subscriberDatabase.get(new SubscriptionKey(clientId, subscriptionName)); } - public synchronized void addSubsciption(SubscriptionInfo info, boolean retroactive) throws IOException { + public synchronized void addSubscription(SubscriptionInfo info, boolean retroactive) throws IOException { SubscriptionKey key = new SubscriptionKey(info); MemoryTopicSub sub = new MemoryTopicSub(); topicSubMap.put(key, sub); http://git-wip-us.apache.org/repos/asf/activemq/blob/351f05e2/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java ---------------------------------------------------------------------- diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java index 8d38234..1efdc63 100755 --- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java +++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java @@ -330,7 +330,7 @@ public class JDBCTopicMessageStore extends JDBCMessageStore implements TopicMess } - public void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { + public void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { TransactionContext c = persistenceAdapter.getTransactionContext(); try { c = persistenceAdapter.getTransactionContext(); http://git-wip-us.apache.org/repos/asf/activemq/blob/351f05e2/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java ---------------------------------------------------------------------- diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java index 64964fb..51d9693 100755 --- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java +++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java @@ -71,9 +71,9 @@ public class JournalTopicMessageStore extends JournalMessageStore implements Top return longTermStore.lookupSubscription(clientId, subscriptionName); } - public void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { + public void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { this.peristenceAdapter.checkpoint(true, true); - longTermStore.addSubsciption(subscriptionInfo, retroactive); + longTermStore.addSubscription(subscriptionInfo, retroactive); } public void addMessage(ConnectionContext context, Message message) throws IOException { http://git-wip-us.apache.org/repos/asf/activemq/blob/351f05e2/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java ---------------------------------------------------------------------- diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java index 0c269b4..3095a0d 100644 --- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java +++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java @@ -662,7 +662,7 @@ public class KahaDBStore extends MessageDatabase implements PersistenceAdapter { } @Override - public void setMemoryUsage(MemoryUsage memoeyUSage) { + public void setMemoryUsage(MemoryUsage memoryUsage) { } @Override public void start() throws Exception { @@ -765,7 +765,7 @@ public class KahaDBStore extends MessageDatabase implements PersistenceAdapter { } @Override - public void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { + public void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { String subscriptionKey = subscriptionKey(subscriptionInfo.getClientId(), subscriptionInfo .getSubscriptionName()); KahaSubscriptionCommand command = new KahaSubscriptionCommand(); http://git-wip-us.apache.org/repos/asf/activemq/blob/351f05e2/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java ---------------------------------------------------------------------- diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java index b68972e..66ae496 100644 --- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java +++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/TempKahaDBStore.java @@ -265,7 +265,7 @@ public class TempKahaDBStore extends TempMessageDatabase implements PersistenceA } @Override - public void setMemoryUsage(MemoryUsage memoeyUSage) { + public void setMemoryUsage(MemoryUsage memoryUsage) { } @Override public void start() throws Exception { @@ -294,7 +294,7 @@ public class TempKahaDBStore extends TempMessageDatabase implements PersistenceA processRemove(command, null); } - public void addSubsciption(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { + public void addSubscription(SubscriptionInfo subscriptionInfo, boolean retroactive) throws IOException { String subscriptionKey = subscriptionKey(subscriptionInfo.getClientId(), subscriptionInfo.getSubscriptionName()); KahaSubscriptionCommand command = new KahaSubscriptionCommand(); command.setDestination(dest); http://git-wip-us.apache.org/repos/asf/activemq/blob/351f05e2/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala index 7f5b534..322656f 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala @@ -816,7 +816,7 @@ class LevelDBStore extends LockableServiceSupport with BrokerServiceAware with P } } - def addSubsciption(info: SubscriptionInfo, retroactive: Boolean) = { + def addSubscription(info: SubscriptionInfo, retroactive: Boolean) = { check_running var sub = db.addSubscription(key, info) subscriptions.synchronized {
