Updated Branches: refs/heads/master df99e0968 -> ef757e2ea
fixing a NPE in InstanceStatusListener Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/cc79d97a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cc79d97a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cc79d97a Branch: refs/heads/master Commit: cc79d97a3a1a07d0fa1408a5158675d04b7c5e79 Parents: 94a940d Author: Isuru <[email protected]> Authored: Wed Dec 18 20:48:56 2013 +0530 Committer: Isuru <[email protected]> Committed: Wed Dec 18 20:48:56 2013 +0530 ---------------------------------------------------------------------- .../adc/mgt/listener/InstanceStatusListener.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cc79d97a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java index 05b5d45..37d08c1 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java @@ -18,10 +18,6 @@ */ package org.apache.stratos.adc.mgt.listener; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.TextMessage; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.adc.mgt.dao.CartridgeSubscriptionInfo; @@ -31,6 +27,10 @@ import org.apache.stratos.messaging.event.instance.status.InstanceStartedEvent; import org.apache.stratos.messaging.util.Constants; import org.apache.stratos.messaging.util.Util; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.TextMessage; + public class InstanceStatusListener implements MessageListener { private static final Log log = LogFactory @@ -59,8 +59,15 @@ public class InstanceStatusListener implements MessageListener { } CartridgeSubscriptionInfo subscription = PersistenceManager.getSubscriptionFromClusterId(clusterId); - ArtifactUpdatePublisher publisher = new ArtifactUpdatePublisher(subscription.getRepository(), clusterId, String.valueOf(subscription.getTenantId())); - publisher.publish(); + if (subscription.getRepository() != null) { + ArtifactUpdatePublisher publisher = new ArtifactUpdatePublisher(subscription.getRepository(), clusterId, String.valueOf(subscription.getTenantId())); + publisher.publish(); + } + else { + //TODO: make this log debug + log.info("No repository found for subscription with alias: " + subscription.getAlias() + ", type: " + subscription.getCartridge() + + ". Not sending the Depsync event"); + } } } catch (Exception e) { if(log.isErrorEnabled()) {
