Repository: incubator-stratos Updated Branches: refs/heads/master ece29e69c -> 3f0fff7b0
handling possible NPEs Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f83160e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f83160e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f83160e3 Branch: refs/heads/master Commit: f83160e308c99c3ddd006b00cccbc77e4aa13e31 Parents: fbcb4a0 Author: Nirmal Fernando <[email protected]> Authored: Wed Feb 26 20:14:18 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Feb 26 20:14:18 2014 +0530 ---------------------------------------------------------------------- .../stratos/cloud/controller/topology/TopologyBuilder.java | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f83160e3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java index 047940c..a7a18fb 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java @@ -390,7 +390,16 @@ public class TopologyBuilder { public static void handleMemberTerminated(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) { Topology topology = TopologyManager.getTopology(); Service service = topology.getService(serviceName); + if (service == null) { + log.warn(String.format("Service %s does not exist", + serviceName)); + } Cluster cluster = service.getCluster(clusterId); + if (cluster == null) { + log.warn(String.format("Cluster %s does not exist", + clusterId)); + } + Member member = cluster.getMember(memberId); if (member == null) {
