Repository: stratos Updated Branches: refs/heads/master 1b68926b1 -> 215565f25
fixing a build failure due to partial commit Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/215565f2 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/215565f2 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/215565f2 Branch: refs/heads/master Commit: 215565f25231974be9be6a4f8674ce13ebfb7669 Parents: 1b68926 Author: reka <[email protected]> Authored: Mon Dec 8 19:20:25 2014 +0530 Committer: reka <[email protected]> Committed: Mon Dec 8 19:20:25 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/monitor/component/ParentComponentMonitor.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/215565f2/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java index 51a98de..0e9e267 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java @@ -165,7 +165,7 @@ public abstract class ParentComponentMonitor extends Monitor { * by traversing to find the terminated dependencies. * it will get invoked when start a child monitor on termination of a sub tree */ - public void startDependencyOnTermination(String parentInstanceId) throws TopologyInConsistentException { + public void startDependencyOnTermination() throws TopologyInConsistentException { //start the first dependency which went to terminated List<ApplicationChildContext> applicationContexts = this.startupDependencyTree. getStarAbleDependenciesByTermination(); @@ -173,7 +173,6 @@ public abstract class ParentComponentMonitor extends Monitor { if(context instanceof GroupChildContext) { GroupMonitor groupMonitor = (GroupMonitor) this.aliasToActiveMonitorsMap. get(context.getId()); - groupMonitor. } else if(context instanceof ClusterChildContext) { } @@ -390,7 +389,7 @@ public abstract class ParentComponentMonitor extends Monitor { (parentContexts.isEmpty() || parentsTerminated || allParentsActive)) { //Find the non existent monitor by traversing dependency tree try { - this.startDependencyOnTermination(parentInstanceId); + this.startDependencyOnTermination(); } catch (TopologyInConsistentException e) { //TODO revert the siblings and notify parent, change a flag for reverting/un-subscription log.error("Error while starting the monitor upon termination" + e);
