Repository: incubator-stratos Updated Branches: refs/heads/master a311fc1c8 -> 4b2d7343e
fixing a NPE in getSubscription(alias, configContext) Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/4b2d7343 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4b2d7343 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4b2d7343 Branch: refs/heads/master Commit: 4b2d7343e3ee2c6402c3b4e4ff15f097aaaf4448 Parents: a311fc1 Author: Isuru <[email protected]> Authored: Fri Apr 11 14:16:07 2014 +0530 Committer: Isuru <[email protected]> Committed: Fri Apr 11 14:16:07 2014 +0530 ---------------------------------------------------------------------- .../rest/endpoint/services/ServiceUtils.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b2d7343/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index 45d1d9c..0f1df47 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -805,13 +805,18 @@ public class ServiceUtils { ,cartridge.getCartridgeType(), cartridge.getCartridgeAlias()); String cartridgeStatus = "Inactive"; int activeMemberCount = 0; - Collection<Member> members = cluster.getMembers(); - for (Member member : members) { - if(member.isActive()) { - cartridgeStatus = "Active"; - activeMemberCount++; - } - } + + // cluster might not be created yet, so need to check + if (cluster != null) { + Collection<Member> members = cluster.getMembers(); + for (Member member : members) { + if(member.isActive()) { + cartridgeStatus = "Active"; + activeMemberCount++; + } + } + } + cartridge.setActiveInstances(activeMemberCount); cartridge.setStatus(cartridgeStatus); return cartridge;
