Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 13ef15c86 -> 5649e6ed4
updating the cluster activation Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5649e6ed Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5649e6ed Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5649e6ed Branch: refs/heads/4.0.0-grouping Commit: 5649e6ed4f4f21ea54f56f53d0f8937c04cee5b0 Parents: 13ef15c Author: reka <[email protected]> Authored: Fri Sep 26 18:41:08 2014 +0530 Committer: reka <[email protected]> Committed: Fri Sep 26 18:41:08 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/status/checker/StatusChecker.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5649e6ed/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java index 4db5017..7f17955 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java @@ -162,8 +162,14 @@ public class StatusChecker { boolean clustersActive; boolean groupsActive; boolean childFound = false; + boolean clusterFound = false; - if (clusterData.containsValue(id) || groups.containsKey(id)) { + for(ClusterDataHolder clusterDataHolder : clusterData.values()) { + if(clusterDataHolder.getClusterId().equals(id)) { + clusterFound = true; + } + } + if (clusterFound || groups.containsKey(id)) { childFound = true; if (!clusterData.isEmpty() && !groups.isEmpty()) { clustersActive = getClusterStatus(clusterData); @@ -216,7 +222,7 @@ public class StatusChecker { for (Map.Entry<String, ClusterDataHolder> clusterDataHolderEntry : clusterData.entrySet()) { Service service = TopologyManager.getTopology().getService(clusterDataHolderEntry.getValue().getServiceType()); if (service.getCluster(clusterDataHolderEntry.getValue().getClusterId()). - getStatus().equals(ClusterStatus.Active)) { + getStatus() == Status.Activated) { clusterActiveStatus = true; } else { clusterActiveStatus = false;
