Repository: stratos Updated Branches: refs/heads/4.1.0-test 58800b3d2 -> d67695e2a
merging 65e6c0ea57451a5333675a252eb2837db50f5aa3 Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d67695e2 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d67695e2 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d67695e2 Branch: refs/heads/4.1.0-test Commit: d67695e2a20cb8bad49f689945c39458f7565c22 Parents: 58800b3 Author: reka <[email protected]> Authored: Thu Dec 11 10:34:39 2014 +0530 Committer: reka <[email protected]> Committed: Thu Dec 11 10:34:39 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/monitor/component/ApplicationMonitor.java | 2 +- .../apache/stratos/autoscaler/monitor/component/GroupMonitor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d67695e2/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java index f8f2e82..ae8ba9a 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java @@ -141,7 +141,7 @@ public class ApplicationMonitor extends ParentComponentMonitor { onChildInactiveEvent(childId, instanceId); } else if (status1 == ClusterStatus.Terminating || status1 == GroupStatus.Terminating) { - //mark the child monitor as inActive in the map + //mark the child monitor as inactive in the map markInstanceAsTerminating(childId, instanceId); } else if (status1 == ClusterStatus.Terminated || status1 == GroupStatus.Terminated) { http://git-wip-us.apache.org/repos/asf/stratos/blob/d67695e2/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java index 98e04c5..00ac964 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java @@ -196,7 +196,7 @@ public class GroupMonitor extends ParentComponentMonitor implements Runnable { } } else if (status1 == ClusterStatus.Terminating || status1 == GroupStatus.Terminating) { - //mark the child monitor as inActive in the map + //mark the child monitor as inactive in the map markInstanceAsTerminating(childId, instanceId); } else if (status1 == ClusterStatus.Terminated || status1 == GroupStatus.Terminated) {
