Repository: stratos Updated Branches: refs/heads/docker-grouping-merge c6815d123 -> 7f178c537
fixed to traverse all clusterdata in application Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7f178c53 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7f178c53 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7f178c53 Branch: refs/heads/docker-grouping-merge Commit: 7f178c5374020b4c2d9e820c970655a827c42844 Parents: c6815d1 Author: reka <[email protected]> Authored: Fri Nov 7 17:16:15 2014 +0530 Committer: reka <[email protected]> Committed: Fri Nov 7 17:16:15 2014 +0530 ---------------------------------------------------------------------- .../event/receiver/topology/AutoscalerTopologyEventReceiver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7f178c53/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 d11c431..ab29c18 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 @@ -84,7 +84,7 @@ public class AutoscalerTopologyEventReceiver implements Runnable { private boolean allClustersInitialized(Application application) { boolean allClustersInitialized = false; - for (ClusterDataHolder holder : application.getClusterDataMap().values()) { + for (ClusterDataHolder holder : application.getClusterDataRecursively()) { TopologyManager.acquireReadLockForCluster(holder.getServiceType(), holder.getClusterId()); @@ -95,13 +95,13 @@ public class AutoscalerTopologyEventReceiver implements Runnable { if (service != null) { if (service.clusterExists(holder.getClusterId())) { allClustersInitialized = true; + return allClustersInitialized; } else { if (log.isDebugEnabled()) { log.debug("[Cluster] " + holder.getClusterId() + " is not found in " + "the Topology"); } allClustersInitialized = false; - return allClustersInitialized; } } else { if (log.isDebugEnabled()) {
