Updated Branches: refs/heads/master 052946499 -> 89fb391c1
handling an 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/b82dbc60 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b82dbc60 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b82dbc60 Branch: refs/heads/master Commit: b82dbc6045e78900be3cea303b18b6a8e34b2d21 Parents: dac753c Author: Isuru <[email protected]> Authored: Thu Jan 9 16:00:42 2014 +0530 Committer: Isuru <[email protected]> Committed: Thu Jan 9 16:00:42 2014 +0530 ---------------------------------------------------------------------- .../manager/publisher/TenantSynzhronizerTask.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b82dbc60/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantSynzhronizerTask.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantSynzhronizerTask.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantSynzhronizerTask.java index a3e0444..af5cd5f 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantSynzhronizerTask.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/publisher/TenantSynzhronizerTask.java @@ -69,12 +69,14 @@ public class TenantSynzhronizerTask implements Task { //List<CartridgeSubscriptionInfo> cartridgeSubscriptions = PersistenceManager.getSubscriptionsForTenant(tenant.getTenantId()); ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// Collection<CartridgeSubscription> cartridgeSubscriptions = new DataInsertionAndRetrievalManager().getCartridgeSubscriptions(tenant.getTenantId()); - for (CartridgeSubscription subscription : cartridgeSubscriptions) { - if(log.isDebugEnabled()) { - log.debug(String.format("Tenant subscription found: [tenant-id] %d [tenant-domain] %s [service] %s", - carbonTenant.getId(), carbonTenant.getDomain(), subscription.getType())); + if (cartridgeSubscriptions != null && !cartridgeSubscriptions.isEmpty()) { + for (CartridgeSubscription subscription : cartridgeSubscriptions) { + if(log.isDebugEnabled()) { + log.debug(String.format("Tenant subscription found: [tenant-id] %d [tenant-domain] %s [service] %s", + carbonTenant.getId(), carbonTenant.getDomain(), subscription.getType())); + } + tenant.addServiceSubscription(subscription.getType()); } - tenant.addServiceSubscription(subscription.getType()); } tenants.add(tenant); }
