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/01/10 07:38:27 UTC

git commit: fixing a NPE

Updated Branches:
  refs/heads/master 9a6dd1715 -> e03ac9844


fixing a NPE


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e03ac984
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e03ac984
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e03ac984

Branch: refs/heads/master
Commit: e03ac984403d2db2c871d6e17a54524ea1d95dd2
Parents: 9a6dd17
Author: Isuru <is...@wso2.com>
Authored: Fri Jan 10 12:07:25 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Fri Jan 10 12:07:25 2014 +0530

----------------------------------------------------------------------
 .../stratos/manager/listener/InstanceStatusListener.java      | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e03ac984/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/listener/InstanceStatusListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/listener/InstanceStatusListener.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/listener/InstanceStatusListener.java
index b3483ab..e371854 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/listener/InstanceStatusListener.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/listener/InstanceStatusListener.java
@@ -72,6 +72,13 @@ public class InstanceStatusListener implements MessageListener {
                 }*/
                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 Set<CartridgeSubscription> cartridgeSubscriptions = new DataInsertionAndRetrievalManager().getCartridgeSubscription(clusterId);
+                if (cartridgeSubscriptions == null || cartridgeSubscriptions.isEmpty()) {
+                    // No subscriptions, return
+                    if (log.isDebugEnabled()) {
+                        log.debug("No subscription information found for cluster id " + clusterId);
+                    }
+                    return;
+                }
 
                 for (CartridgeSubscription cartridgeSubscription : cartridgeSubscriptions) {
                     // If only this is a non-multitenant Cartridge Subscription and repository is not null, need to