Repository: stratos Updated Branches: refs/heads/master 15d8ab99c -> a041c8b4c
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/a041c8b4 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a041c8b4 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a041c8b4 Branch: refs/heads/master Commit: a041c8b4c60eac5e0d4b475805446385155359f6 Parents: 15d8ab9 Author: reka <[email protected]> Authored: Thu Jul 2 17:59:25 2015 +0530 Committer: reka <[email protected]> Committed: Thu Jul 2 17:59:25 2015 +0530 ---------------------------------------------------------------------- .../context/partition/ClusterLevelPartitionContext.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a041c8b4/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 92626e0..9f3d7ce 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 @@ -29,6 +29,7 @@ import org.apache.stratos.cloud.controller.stub.domain.MemberContext; import org.apache.stratos.common.client.CloudControllerServiceClient; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.common.partition.PartitionRef; +import org.apache.stratos.messaging.domain.instance.ClusterInstance; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.ClusterStatus; import org.apache.stratos.messaging.domain.topology.Service; @@ -668,7 +669,9 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se if(service != null) { Cluster cluster = service.getCluster(clusterId); if(cluster != null) { - status = cluster. getInstanceContexts(clusterInstanceId).getStatus(); + ClusterInstance instance = cluster. + getInstanceContexts(clusterInstanceId); + status = instance.getStatus(); } }
