Repository: stratos Updated Branches: refs/heads/master 258bbc27f -> 08239dcb1
Initializing scaling dependencies set in parent component monitor when dependencies are not defined Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/08239dcb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/08239dcb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/08239dcb Branch: refs/heads/master Commit: 08239dcb196fe4807b304cf6ccbd9dfb6a3d6d45 Parents: 258bbc2 Author: Imesh Gunaratne <[email protected]> Authored: Fri Dec 19 11:02:38 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Dec 19 11:02:38 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/monitor/component/ParentComponentMonitor.java | 5 ++++- .../autoscaler/pojo/policy/deployment/DeploymentPolicy.java | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/08239dcb/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 6f45a8f..d927223 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 @@ -95,8 +95,11 @@ public abstract class ParentComponentMonitor extends Monitor implements Runnable //Building the startup dependencies for this monitor within the immediate children startupDependencyTree = DependencyBuilder.getInstance().buildDependency(component); //Building the scaling dependencies for this monitor within the immediate children - if(component.getDependencyOrder() != null) { + if((component.getDependencyOrder() != null) && (component.getDependencyOrder().getScalingDependents() != null)) { scalingDependencies = DependencyBuilder.getInstance().buildScalingDependencies(component); + } else { + // No scaling dependencies found, initialize to an empty set + scalingDependencies = new HashSet<ScalingDependentList>(); } //Create the executor service with identifier and thread pool size executorService = StratosThreadPool.getExecutorService(IDENTIFIER, THREAD_POOL_SIZE); http://git-wip-us.apache.org/repos/asf/stratos/blob/08239dcb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java index b2c9e52..7dd9e4e 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java @@ -210,8 +210,10 @@ public class DeploymentPolicy implements Serializable{ public ChildPolicy getChildPolicy(String id) { for(ChildPolicy childPolicy : childPolicies) { - if (childPolicy.getAlias().equals(id)) { - return childPolicy; + if(childPolicy != null) { + if (childPolicy.getAlias().equals(id)) { + return childPolicy; + } } } return null;
