You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/12/08 14:58:13 UTC
stratos git commit: fixing build issue
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 1b68926b1 -> 05eba6145
fixing build issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/05eba614
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/05eba614
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/05eba614
Branch: refs/heads/4.1.0-test
Commit: 05eba6145bad26cdb5240b8d2c76830626ecbcc7
Parents: 1b68926
Author: reka <rt...@gmail.com>
Authored: Mon Dec 8 19:27:56 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon Dec 8 19:27:56 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/05eba614/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);