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 2015/05/19 13:59:30 UTC
[4/6] stratos git commit: fixing NPE when lookup using parent
instance iD
fixing NPE when lookup using parent instance iD
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ac1711b9
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ac1711b9
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ac1711b9
Branch: refs/heads/master
Commit: ac1711b94e24f2307f5b74171cb928f0f446e538
Parents: df51054
Author: reka <rt...@gmail.com>
Authored: Mon May 18 22:43:28 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Tue May 19 17:29:15 2015 +0530
----------------------------------------------------------------------
.../main/java/org/apache/stratos/autoscaler/monitor/Monitor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ac1711b9/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java
index bc43a4d..07d791f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java
@@ -187,7 +187,7 @@ public abstract class Monitor implements EventHandler, Runnable {
public List<String> getInstancesByParentInstanceId(String parentInstanceId) {
List<String> instances = new ArrayList<String>();
for (Instance instance : instanceIdToInstanceMap.values()) {
- if (instance.getParentId().equals(parentInstanceId)) {
+ if (instance.getParentId() != null && instance.getParentId().equals(parentInstanceId)) {
instances.add(instance.getInstanceId());
}
}