Repository: stratos Updated Branches: refs/heads/master 830785f1c -> 403d5a45d
http://git-wip-us.apache.org/repos/asf/stratos/blob/403d5a45/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/PodActivationWatcher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/PodActivationWatcher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/PodActivationWatcher.java index a898c58..d03f0d9 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/PodActivationWatcher.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/PodActivationWatcher.java @@ -48,7 +48,7 @@ public class PodActivationWatcher implements Runnable { @Override public void run() { try { - CloudControllerContext dataHolder = CloudControllerContext.getInstance(); + CloudControllerContext cloudControllerContext = CloudControllerContext.getInstance(); Pod pod = kubApi.getPod(podId); if (LOG.isDebugEnabled()) { LOG.debug("PodActivationWatcher running : "+pod.getCurrentState().getStatus()); @@ -57,13 +57,12 @@ public class PodActivationWatcher implements Runnable { String hostIP = pod.getCurrentState().getHost(); ctxt.setPublicIpAddress(hostIP); ctxt.setPrivateIpAddress(hostIP); - dataHolder.addMemberContext(ctxt); + cloudControllerContext.addMemberContext(ctxt); // trigger topology TopologyBuilder.handleMemberSpawned(ctxt.getCartridgeType(), ctxt.getClusterId(), null, hostIP, hostIP, ctxt); - RegistryManager.getInstance().persist(dataHolder); - + cloudControllerContext.persist(); } } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/403d5a45/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/CloudControllerContextTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/CloudControllerContextTest.java b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/CloudControllerContextTest.java index 710b751..cb1aaee 100644 --- a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/CloudControllerContextTest.java +++ b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/CloudControllerContextTest.java @@ -18,12 +18,14 @@ */ package org.apache.cartridge.autoscaler.service.axiom; +import org.apache.axis2.engine.AxisConfiguration; import org.apache.stratos.cloud.controller.context.CloudControllerContext; import org.apache.stratos.cloud.controller.domain.MemberContext; import junit.framework.TestCase; +import org.apache.stratos.cloud.controller.internal.ServiceReferenceHolder; public class CloudControllerContextTest extends TestCase { - + public CloudControllerContextTest(String name) { super(name); } @@ -33,17 +35,19 @@ public class CloudControllerContextTest extends TestCase { } public final void testMemberContextOperations() throws Exception { - - - CloudControllerContext dataHolder = CloudControllerContext.getInstance(); - Thread t1 = new Thread(new MemberAdder(dataHolder)); + AxisConfiguration axisConfiguration = new AxisConfiguration(); + axisConfiguration.setClusteringAgent(null); + ServiceReferenceHolder.getInstance().setAxisConfiguration(axisConfiguration); + + CloudControllerContext context = CloudControllerContext.getInstance(); + Thread t1 = new Thread(new MemberAdder(context)); t1.start(); t1.join(); - assertEquals(2, dataHolder.getMemberContextsOfClusterId("123").size()); - Thread t2 = new Thread(new MemberRemover(dataHolder)); + assertEquals(2, context.getMemberContextsOfClusterId("123").size()); + Thread t2 = new Thread(new MemberRemover(context)); t2.start(); t2.join(); - assertEquals(1, dataHolder.getMemberContextsOfClusterId("123").size()); + assertEquals(1, context.getMemberContextsOfClusterId("123").size()); } class MemberAdder implements Runnable {
