anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed methods in SubscriptionStore, connect-> activate disconnect ->deactivate

Browse Source
This commit is contained in:
selva.andre
2012-09-05 21:35:20 +02:00
parent d9d58e498f
commit de2937d4dd
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
+2 -3
View File
@@ -5,7 +5,6 @@ import com.lmax.disruptor.EventHandler;
import com.lmax.disruptor.RingBuffer;
import com.lmax.disruptor.SequenceBarrier;
import java.text.ParseException;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -261,7 +260,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
}
}
subscriptions.connect(msg.getClientID());
subscriptions.activate(msg.getClientID());
//handle clean session flag
if (msg.isCleanSession()) {
@@ -394,7 +393,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
//de-activate the subscriptions for this ClientID
// String clientID = (String) evt.getSession().getAttribute(Constants.ATTR_CLIENTID);
subscriptions.disconnect(clientID);
subscriptions.deactivate(clientID);
}
private void processStop() {
parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java
+5 -6
View File
@@ -5,7 +5,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Queue;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.LinkedBlockingQueue;
import org.dna.mqtt.moquette.messaging.spi.IStorageService;
import org.slf4j.Logger;
@@ -111,13 +110,13 @@ public class SubscriptionsStore {
m_storageService.removeAllSubscriptions(clientID);
}
public void disconnect(String clientID) {
subscriptions.disconnect(clientID);
public void deactivate(String clientID) {
subscriptions.deactivate(clientID);
}
public void connect(String clientID) {
LOG.debug("connect re-activating subscriptions for clientID " + clientID);
subscriptions.connect(clientID);
public void activate(String clientID) {
LOG.debug("activate re-activating subscriptions for clientID " + clientID);
subscriptions.activate(clientID);
}
public List<Subscription> matches(String topic) {
parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/TreeNode.java
+4 -4
View File
@@ -122,7 +122,7 @@ class TreeNode {
/**
* Deactivate all topic subscriptions for the given clientID.
* */
void disconnect(String clientID) {
void deactivate(String clientID) {
for (Subscription s : m_subscriptions) {
if (s.clientId.equals(clientID)) {
s.setActive(false);
@@ -131,14 +131,14 @@ class TreeNode {
//go deep
for (TreeNode child : m_children) {
child.disconnect(clientID);
child.deactivate(clientID);
}
}
/**
* Activate all topic subscriptions for the given clientID.
* */
public void connect(String clientID) {
public void activate(String clientID) {
for (Subscription s : m_subscriptions) {
if (s.clientId.equals(clientID)) {
s.setActive(true);
@@ -147,7 +147,7 @@ class TreeNode {
//go deep
for (TreeNode child : m_children) {
child.disconnect(clientID);
child.deactivate(clientID);
}
}