Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 5196529d4 -> 5e69c7fe6
fixing recursive call when terminating cluster/group Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5e69c7fe Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5e69c7fe Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5e69c7fe Branch: refs/heads/4.0.0-grouping Commit: 5e69c7fe6d5eb00c64e7bc7c4159859632b7fd0a Parents: 5196529 Author: reka <[email protected]> Authored: Wed Oct 29 18:23:04 2014 +0530 Committer: reka <[email protected]> Committed: Wed Oct 29 18:23:20 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/monitor/MonitorStatusEventBuilder.java | 4 ++-- .../apache/stratos/autoscaler/monitor/group/GroupMonitor.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5e69c7fe/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorStatusEventBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorStatusEventBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorStatusEventBuilder.java index 30187ea..59bb4c0 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorStatusEventBuilder.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorStatusEventBuilder.java @@ -53,8 +53,8 @@ public class MonitorStatusEventBuilder { parent.onChildEvent(statusEvent); } - public static void notifyChildren (ParentComponentMonitor parent, MonitorStatusEvent statusEvent) { - for (Monitor activeChildMonitor : parent.getAliasToActiveMonitorsMap().values()) { + public static void notifyChildren (ParentComponentMonitor componentMonitor, MonitorStatusEvent statusEvent) { + for (Monitor activeChildMonitor : componentMonitor.getAliasToActiveMonitorsMap().values()) { activeChildMonitor.onParentEvent(statusEvent); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/5e69c7fe/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java index b42e840..b1b7882 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java @@ -162,6 +162,6 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler } //} //notify the children about the state change - MonitorStatusEventBuilder.notifyChildren(this.parent, new GroupStatusEvent(status, getId())); + MonitorStatusEventBuilder.notifyChildren(this, new GroupStatusEvent(status, getId())); } }
