deleting some commented out methods
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/34462ee8 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/34462ee8 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/34462ee8 Branch: refs/heads/stratos-4.1.x Commit: 34462ee8326fe5d76bbc3890f12f98b1efbee01c Parents: 6b179e9 Author: Isuru Haththotuwa <[email protected]> Authored: Thu Dec 17 21:39:47 2015 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Fri Dec 25 16:46:38 2015 +0530 ---------------------------------------------------------------------- .../application/ApplicationsEventReceiver.java | 8 -------- .../signup/ApplicationSignUpEventReceiver.java | 8 -------- .../cluster/status/ClusterStatusEventReceiver.java | 17 ++++------------- .../health/stat/HealthStatEventReceiver.java | 17 ++++------------- .../initializer/InitializerEventReceiver.java | 8 -------- .../notifier/InstanceNotifierEventReceiver.java | 5 +---- .../receiver/tenant/TenantEventReceiver.java | 4 ---- 7 files changed, 9 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/34462ee8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java index f9a14ae..a68e0e5 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java @@ -115,12 +115,4 @@ public class ApplicationsEventReceiver extends StratosEventReceiver{ } }); } - -// public ExecutorService getExecutorService() { -// return executor; -// } -// -// public void setExecutorService(ExecutorService executor) { -// this.executor = executor; -// } } http://git-wip-us.apache.org/repos/asf/stratos/blob/34462ee8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java index 49964f9..a28a98f 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java @@ -117,12 +117,4 @@ public class ApplicationSignUpEventReceiver extends StratosEventReceiver { eventSubscriber.terminate(); messageDelegator.terminate(); } - -// public ExecutorService getExecutorService() { -// return executor; -// } - -// public void setExecutorService(ExecutorService executor) { -// this.executor = executor; -// } } http://git-wip-us.apache.org/repos/asf/stratos/blob/34462ee8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java index aae1cef..d797305 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java @@ -90,17 +90,8 @@ public class ClusterStatusEventReceiver extends StratosEventReceiver { return ((eventSubscriber != null) && (eventSubscriber.isSubscribed())); } -// public void terminate() { -// eventSubscriber.terminate(); -// messageDelegator.terminate(); -// terminated = true; -// } -// -// public ExecutorService getExecutorService() { -// return executor; -// } -// -// public void setExecutorService(ExecutorService executor) { -// this.executor = executor; -// } + public void terminate() { + eventSubscriber.terminate(); + messageDelegator.terminate(); + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/34462ee8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java index 4be2fea..cc94c6d 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java @@ -83,17 +83,8 @@ public class HealthStatEventReceiver extends StratosEventReceiver { } } -// public void terminate() { -// eventSubscriber.terminate(); -// messageDelegator.terminate(); -// terminated = true; -// } -// -// public ExecutorService getExecutorService() { -// return executor; -// } -// -// public void setExecutorService(ExecutorService executor) { -// this.executor = executor; -// } + public void terminate() { + eventSubscriber.terminate(); + messageDelegator.terminate(); + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/34462ee8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java index f2e2131..b3a29b1 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java @@ -83,12 +83,4 @@ public class InitializerEventReceiver extends StratosEventReceiver { eventSubscriber.terminate(); messageDelegator.terminate(); } - -// public ExecutorService getExecutorService() { -// return executor; -// } -// -// public void setExecutorService(ExecutorService executor) { -// this.executor = executor; -// } } http://git-wip-us.apache.org/repos/asf/stratos/blob/34462ee8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java index 0e91c29..8eb2bb0 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java @@ -43,10 +43,7 @@ public class InstanceNotifierEventReceiver extends StratosEventReceiver { this.executor = StratosThreadPool.getExecutorService("messaging-event-receiver", 35, 150); InstanceNotifierEventMessageQueue messageQueue = new InstanceNotifierEventMessageQueue(); this.messageDelegator = new InstanceNotifierEventMessageDelegator(messageQueue); - messageListener = new InstanceNotifierEventMessageListener(messageQueue); - // Start topic subscriber thread - eventSubscriber = new EventSubscriber(MessagingUtil.Topics.INSTANCE_NOTIFIER_TOPIC.getTopicName(), - messageListener); + this.messageListener = new InstanceNotifierEventMessageListener(messageQueue); execute(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/34462ee8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java index 1d55ce4..1a8473e 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java @@ -66,10 +66,6 @@ public class TenantEventReceiver extends StratosEventReceiver { messageDelegator.addEventListener(eventListener); } -// public void setExecutorService(ExecutorService executor) { -// this.executor = executor; -// } - private void execute() { try { // Start topic subscriber thread
