Repository: stratos Updated Branches: refs/heads/master efd079d06 -> 6af14ca09
Fix s/instanceContext/instance Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/27909b1a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/27909b1a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/27909b1a Branch: refs/heads/master Commit: 27909b1addef80af7ddd157ac90c1fd95c28fbc2 Parents: 608b368 Author: Lahiru Sandaruwan <[email protected]> Authored: Thu Dec 4 22:29:33 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Thu Dec 4 22:30:18 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/applications/topic/ApplicationBuilder.java | 5 ++--- .../stratos/messaging/domain/applications/ParentComponent.java | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/27909b1a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java index 06271db..643ec48 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java @@ -28,7 +28,6 @@ import org.apache.stratos.autoscaler.event.publisher.ClusterStatusEventPublisher import org.apache.stratos.autoscaler.monitor.component.ApplicationMonitor; import org.apache.stratos.autoscaler.monitor.component.GroupMonitor; import org.apache.stratos.autoscaler.pojo.policy.PolicyManager; -import org.apache.stratos.autoscaler.pojo.policy.deployment.*; import org.apache.stratos.messaging.domain.applications.*; import org.apache.stratos.messaging.domain.instance.ApplicationInstance; import org.apache.stratos.messaging.domain.instance.ClusterInstance; @@ -105,7 +104,7 @@ public class ApplicationBuilder { applicationInstance = new ApplicationInstance(appId, instanceId); applicationInstance.setStatus(status); applicationInstance.setNetworkPartitionId(networkPartitionId); - application.addInstanceContext(instanceId, applicationInstance); + application.addInstance(instanceId, applicationInstance); //updateApplicationMonitor(appId, status); ApplicationHolder.persistApplication(application); //ApplicationsEventPublisher.sendApplicationActivatedEvent(appId); @@ -426,7 +425,7 @@ public class ApplicationBuilder { GroupInstance context = new GroupInstance(groupId, instanceId); context.setParentId(parentId); context.setStatus(status); - group.addInstanceContext(instanceId, context); + group.addInstance(instanceId, context); //updateGroupMonitor(appId, groupId, status); ApplicationHolder.persistApplication(application); //ApplicationsEventPublisher.sendGroupCreatedEvent(appId, groupId); http://git-wip-us.apache.org/repos/asf/stratos/blob/27909b1a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java index 285ad2f..36eb406 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java @@ -224,10 +224,10 @@ public abstract class ParentComponent<T extends Instance> implements Serializabl * Adds InstanceContext of a child to the instanceIdToInstanceContextMap. * * @param instanceId instance id of child - * @param instanceContext InstanceContext object + * @param instance InstanceContext object */ - public void addInstanceContext (String instanceId, T instanceContext) { - instanceIdToInstanceContextMap.put(instanceId, instanceContext); + public void addInstance(String instanceId, T instance) { + instanceIdToInstanceContextMap.put(instanceId, instance); } /**
