Repository: stratos Updated Branches: refs/heads/master 6c8c0adb0 -> fce3db71a
Fixing an NPE in the PendingMemeberWatcher due to no instances Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fce3db71 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fce3db71 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fce3db71 Branch: refs/heads/master Commit: fce3db71a691addf52f84ed60327cdb41af79e7f Parents: 6c8c0ad Author: reka <[email protected]> Authored: Thu Jul 2 18:02:27 2015 +0530 Committer: reka <[email protected]> Committed: Thu Jul 2 23:52:14 2015 +0530 ---------------------------------------------------------------------- .../context/partition/ClusterLevelPartitionContext.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/fce3db71/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java index 9f3d7ce..4bbd73a 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java @@ -671,7 +671,9 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se if(cluster != null) { ClusterInstance instance = cluster. getInstanceContexts(clusterInstanceId); - status = instance.getStatus(); + if(instance!= null) { + status = instance.getStatus(); + } } }
