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/11/05 08:01:36 UTC

git commit: fixing an NPE while readin properties in cluster monitor

Repository: stratos
Updated Branches:
  refs/heads/docker-grouping-merge 87908a441 -> a2ba3e055


fixing an NPE while readin properties in cluster monitor


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a2ba3e05
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a2ba3e05
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a2ba3e05

Branch: refs/heads/docker-grouping-merge
Commit: a2ba3e0559b1a006157f959384cab0aedb7933a6
Parents: 87908a4
Author: reka <rt...@gmail.com>
Authored: Wed Nov 5 12:31:06 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Wed Nov 5 12:31:06 2014 +0530

----------------------------------------------------------------------
 .../stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/a2ba3e05/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java
index 68307e8..57f8e36 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java
@@ -188,7 +188,7 @@ public class ClusterMonitorFactory {
         // find lb reference type
         java.util.Properties props = cluster.getProperties();
 
-        if (props.containsKey(Constants.LOAD_BALANCER_REF)) {
+        if (props != null && props.containsKey(Constants.LOAD_BALANCER_REF)) {
             String value = props.getProperty(Constants.LOAD_BALANCER_REF);
             clusterMonitor.setLbReferenceType(value);
             if (log.isDebugEnabled()) {