You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2016/01/05 16:47:41 UTC
[32/50] [abbrv] stratos git commit: fixing conflicts in
StratosThreadPool
fixing conflicts in StratosThreadPool
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6afa5f25
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6afa5f25
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6afa5f25
Branch: refs/heads/stratos-4.1.x
Commit: 6afa5f25aab3a4708b446031612db6ec074a47e9
Parents: c7dc666
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Fri Dec 4 05:22:40 2015 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Fri Dec 25 15:36:40 2015 +0530
----------------------------------------------------------------------
.../agent/test/JavaCartridgeAgentTest.java | 4 ----
.../status/InstanceStatusTopicReceiver.java | 17 -----------------
.../status/InstanceStatusEventReceiver.java | 9 ---------
3 files changed, 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6afa5f25/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
index 751e7c8..e6b7b98 100644
--- a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
+++ b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
@@ -123,12 +123,8 @@ public class JavaCartridgeAgentTest {
// ExecutorService executorService = StratosThreadPool.getExecutorService("TEST_THREAD_POOL", 5);
topologyEventReceiver = TopologyEventReceiver.getInstance();
- //topologyEventReceiver.setExecutorService(executor);
- //topologyEventReceiver.execute();
instanceStatusEventReceiver = InstanceStatusEventReceiver.getInstance();
-// instanceStatusEventReceiver.setExecutorService(executor);
-// instanceStatusEventReceiver.execute();
instanceStarted = false;
instanceStatusEventReceiver.addEventListener(new InstanceStartedEventListener() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/6afa5f25/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java
index a3bbc2b..fc2f393 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java
@@ -31,9 +31,6 @@ import org.apache.stratos.messaging.listener.instance.status.InstanceMaintenance
import org.apache.stratos.messaging.listener.instance.status.InstanceReadyToShutdownEventListener;
import org.apache.stratos.messaging.listener.instance.status.InstanceStartedEventListener;
import org.apache.stratos.messaging.message.receiver.instance.status.InstanceStatusEventReceiver;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-
-import java.util.concurrent.ExecutorService;
/**
* This will handle the instance status events
@@ -42,26 +39,12 @@ public class InstanceStatusTopicReceiver {
private static final Log log = LogFactory.getLog(InstanceStatusTopicReceiver.class);
private InstanceStatusEventReceiver statusEventReceiver;
- //private boolean terminated;
- //private ExecutorService executorService;
public InstanceStatusTopicReceiver() {
this.statusEventReceiver = InstanceStatusEventReceiver.getInstance();
addEventListeners();
}
-// public void execute() {
-// statusEventReceiver.setExecutorService(executor);
-// statusEventReceiver.execute();
-// if (log.isInfoEnabled()) {
-// log.info("Cloud controller application status thread started");
-// }
-//
-// if (log.isInfoEnabled()) {
-// log.info("Cloud controller application status thread terminated");
-// }
-// }
-
private void addEventListeners() {
statusEventReceiver.addEventListener(new InstanceActivatedEventListener() {
@Override
http://git-wip-us.apache.org/repos/asf/stratos/blob/6afa5f25/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java
index 4126f69..5471915 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java
@@ -91,14 +91,5 @@ public class InstanceStatusEventReceiver extends StratosEventReceiver {
public void terminate() {
eventSubscriber.terminate();
messageDelegator.terminate();
- // terminated = true;
}
-
-// public ExecutorService getExecutorService() {
-// return executor;
-// }
-//
-// public void setExecutorService(ExecutorService executor) {
-// this.executor = executor;
-// }
}