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:19 UTC
[10/50] [abbrv] stratos git commit: fixing references for event
listener singletons
fixing references for event listener singletons
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/503a86ff
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/503a86ff
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/503a86ff
Branch: refs/heads/stratos-4.1.x
Commit: 503a86ffc7bedfe5736c0387d0c477d56a816ec5
Parents: c103ad0
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Wed Dec 2 19:20:49 2015 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Mon Dec 7 18:48:09 2015 +0530
----------------------------------------------------------------------
.../application/ApplicationsEventReceiver.java | 2 +-
.../tests/PythonAgentIntegrationTest.java | 6 +++---
.../integration/common/TopologyHandler.java | 18 +++++++++---------
3 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/503a86ff/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 e94bafd..4b86529 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
@@ -68,7 +68,7 @@ public class ApplicationsEventReceiver extends StratosEventReceiver{
messageDelegator.removeEventListener(eventListener);
}
- public void execute() {
+ private void execute() {
try {
// Start topic subscriber thread
eventSubscriber = new EventSubscriber(MessagingUtil.Topics.APPLICATION_TOPIC.getTopicName(),
http://git-wip-us.apache.org/repos/asf/stratos/blob/503a86ff/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java
index f31583c..bf99eb7 100644
--- a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java
+++ b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java
@@ -148,9 +148,9 @@ public abstract class PythonAgentIntegrationTest {
}
});
- initializerEventReceiver = new InitializerEventReceiver();
- initializerEventReceiver.setExecutorService(executorService);
- initializerEventReceiver.execute();
+ initializerEventReceiver = InitializerEventReceiver.getInstance();
+// initializerEventReceiver.setExecutorService(executorService);
+// initializerEventReceiver.execute();
this.eventReceiverInitialized = true;
http://git-wip-us.apache.org/repos/asf/stratos/blob/503a86ff/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java b/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java
index 5a199c7..bdd087b 100644
--- a/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java
+++ b/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java
@@ -114,17 +114,17 @@ public class TopologyHandler {
}
private void initializeTenantEventReceiver() {
- tenantEventReceiver = new TenantEventReceiver();
- tenantEventReceiver.setExecutorService(executorService);
- tenantEventReceiver.execute();
+ tenantEventReceiver = TenantEventReceiver.getInstance();
+// tenantEventReceiver.setExecutorService(executorService);
+// tenantEventReceiver.execute();
}
/**
* Initialize application event receiver
*/
private void initializeHealthStatsEventReceiver() {
- healthStatEventReceiver = new HealthStatEventReceiver();
- healthStatEventReceiver.setExecutorService(executorService);
+ healthStatEventReceiver = HealthStatEventReceiver.getInstance();
+// healthStatEventReceiver.setExecutorService(executorService);
healthStatEventReceiver.addEventListener(new MemberFaultEventListener() {
@Override
protected void onEvent(Event event) {
@@ -133,15 +133,15 @@ public class TopologyHandler {
memberFaultEvent.getMemberId()));
}
});
- healthStatEventReceiver.execute();
+// healthStatEventReceiver.execute();
}
/**
* Initialize application event receiver
*/
private void initializeApplicationEventReceiver() {
- applicationsEventReceiver = new ApplicationsEventReceiver();
- applicationsEventReceiver.setExecutorService(executorService);
+ applicationsEventReceiver = ApplicationsEventReceiver.getInstance();
+// applicationsEventReceiver.setExecutorService(executorService);
applicationsEventReceiver.addEventListener(new ApplicationInstanceActivatedEventListener() {
@Override
protected void onEvent(Event event) {
@@ -164,7 +164,7 @@ public class TopologyHandler {
appInstanceInactivatedEvent.getInstanceId()));
}
});
- applicationsEventReceiver.execute();
+ //applicationsEventReceiver.execute();
}
/**