Repository: stratos Updated Branches: refs/heads/master 3ff88d908 -> 5e78dd461
Fix status retrival stack Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5e78dd46 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5e78dd46 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5e78dd46 Branch: refs/heads/master Commit: 5e78dd4611a59b5a64031a883817abdd34460b46 Parents: 3ff88d9 Author: Lahiru Sandaruwan <[email protected]> Authored: Fri Dec 5 00:07:39 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri Dec 5 00:07:46 2014 +0530 ---------------------------------------------------------------------- .../AutoscalerTopologyEventReceiver.java | 2 +- .../domain/instance/ClusterInstance.java | 21 ++++++++++++++++++++ .../messaging/domain/instance/Instance.java | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5e78dd46/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java index 1849ef3..870f632 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java @@ -255,7 +255,7 @@ public class AutoscalerTopologyEventReceiver { } //changing the status in the monitor, will notify its parent monitor ClusterInstance clusterInstance = (ClusterInstance) monitor.getInstance(instanceId); - if (clusterInstance.getTransitionedStates().pop() == ClusterStatus.Active) { + if (clusterInstance.getPreviousState() == ClusterStatus.Active) { // terminated gracefully monitor.setStatus(ClusterStatus.Terminating, instanceId); InstanceNotificationPublisher.sendInstanceCleanupEventForCluster(clusterId, instanceId); http://git-wip-us.apache.org/repos/asf/stratos/blob/5e78dd46/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/ClusterInstance.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/ClusterInstance.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/ClusterInstance.java index a843b33..38d1108 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/ClusterInstance.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/ClusterInstance.java @@ -62,4 +62,25 @@ public class ClusterInstance extends Instance<ClusterStatus> implements LifeCycl public void setPartitionId(String partitionId) { this.partitionId = partitionId; } + + + /** + * Get the current state + * + * @return the current state + */ + public ClusterStatus getCurrentState () { + return lifeCycleStateManager.getCurrentState(); + } + + /** + * Retrieves the previous state + * + * @return previous state + */ + public ClusterStatus getPreviousState () { + return lifeCycleStateManager.getPreviousState(); + } + + } http://git-wip-us.apache.org/repos/asf/stratos/blob/5e78dd46/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/Instance.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/Instance.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/Instance.java index 60d15ff..a994d2e 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/Instance.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/Instance.java @@ -95,5 +95,6 @@ public abstract class Instance<T extends LifeCycleState> implements Serializable public void setNetworkPartitionId(String networkPartitionId) { this.networkPartitionId = networkPartitionId; } + }
