Repository: stratos Updated Branches: refs/heads/master ec8b3ee79 -> 1b9488cb5
Fix variable handling issues Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1b9488cb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1b9488cb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1b9488cb Branch: refs/heads/master Commit: 1b9488cb5dd787b8ab7f69734b0282d36db34363 Parents: ec8b3ee Author: Lahiru Sandaruwan <[email protected]> Authored: Fri Apr 24 17:17:38 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri Apr 24 17:17:38 2015 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/monitor/cluster/ClusterMonitor.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/1b9488cb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java index 4154493..88f0829 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java @@ -113,7 +113,6 @@ public class ClusterMonitor extends Monitor implements Runnable { private static final Log log = LogFactory.getLog(ClusterMonitor.class); private boolean hasPrimary; - private float scalingFactorBasedOnDependencies = 1.0f; private String deploymentPolicyId; @@ -687,8 +686,7 @@ public class ClusterMonitor extends Monitor implements Runnable { + ", [event] " + scalingEvent.getId() + ", [group instance] " + scalingEvent.getInstanceId() + ", [factor] " + scalingEvent.getFactor()); - - this.scalingFactorBasedOnDependencies = scalingEvent.getFactor(); + float scalingFactorBasedOnDependencies = scalingFactorBasedOnDependencies = scalingEvent.getFactor(); ClusterContext vmClusterContext = (ClusterContext) clusterContext; String instanceId = scalingEvent.getInstanceId(); @@ -1397,9 +1395,8 @@ public class ClusterMonitor extends Monitor implements Runnable { throw new RuntimeException("Network partition context not found: [network-partition-id] " + networkPartitionId); } - ClusterInstanceContext instanceContext = (ClusterInstanceContext) networkPartitionContext. - getInstanceContext(instanceId); - return instanceContext; + + return (ClusterInstanceContext) networkPartitionContext.getInstanceContext(instanceId); } public Collection<ClusterLevelNetworkPartitionContext> getNetworkPartitionCtxts() {
