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/15 11:07:38 UTC
[3/3] stratos git commit: adding null check
adding null check
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b9f61469
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b9f61469
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b9f61469
Branch: refs/heads/4.1.0-test
Commit: b9f614693ae5f338c80a7bc1ba0d0e0870894dac
Parents: 09d159d
Author: reka <rt...@gmail.com>
Authored: Mon Dec 15 14:55:48 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon Dec 15 15:37:24 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/autoscaler/monitor/MonitorFactory.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b9f61469/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java
index d4414af..264f440 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java
@@ -244,10 +244,12 @@ public class MonitorFactory {
}
boolean hasScalingDependents = false;
- for (ScalingDependentList scalingDependentList : parentMonitor.getScalingDependencies()) {
- if (scalingDependentList.getScalingDependentListComponents().
- contains("cartridge." + clusterId.substring(0, clusterId.indexOf('.')))) {
- hasScalingDependents = true;
+ if(parentMonitor.getScalingDependencies() != null) {
+ for (ScalingDependentList scalingDependentList : parentMonitor.getScalingDependencies()) {
+ if (scalingDependentList.getScalingDependentListComponents().
+ contains("cartridge." + clusterId.substring(0, clusterId.indexOf('.')))) {
+ hasScalingDependents = true;
+ }
}
}