You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/04/11 10:51:08 UTC
git commit: checking if cluster members are non-null
Repository: incubator-stratos
Updated Branches:
refs/heads/master 4b2d7343e -> 919a1e787
checking if cluster members are non-null
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/919a1e78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/919a1e78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/919a1e78
Branch: refs/heads/master
Commit: 919a1e787b082b6544211a43794e702b1b011184
Parents: 4b2d734
Author: Isuru <is...@wso2.com>
Authored: Fri Apr 11 14:20:49 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Fri Apr 11 14:20:49 2014 +0530
----------------------------------------------------------------------
.../stratos/rest/endpoint/services/ServiceUtils.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/919a1e78/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 0f1df47..6982391 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
@@ -809,10 +809,12 @@ public class ServiceUtils {
// 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++;
+ if (members != null ) {
+ for (Member member : members) {
+ if(member.isActive()) {
+ cartridgeStatus = "Active";
+ activeMemberCount++;
+ }
}
}
}