Updated Branches: refs/heads/master 193f8d367 -> 2dbf5598a
Fixed tenant event message listener by changing message queue name Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/2dbf5598 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2dbf5598 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2dbf5598 Branch: refs/heads/master Commit: 2dbf5598a6aa51c3df0f8b4bf87ea6c98dea604a Parents: 193f8d3 Author: Imesh Gunaratne <[email protected]> Authored: Sun Dec 8 07:54:30 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sun Dec 8 07:54:30 2013 +0530 ---------------------------------------------------------------------- .../receiver/tenant/TenantEventMessageDelegator.java | 14 ++++---------- .../receiver/tenant/TenantEventMessageListener.java | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2dbf5598/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageDelegator.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageDelegator.java index e93c886..ef68da2 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageDelegator.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageDelegator.java @@ -62,21 +62,15 @@ public class TenantEventMessageDelegator implements Runnable { // Retrieve the actual message String json = message.getText(); - if (log.isDebugEnabled()) { log.debug(String.format("Tenant event message received from queue: %s", type)); } - try { - TenantManager.acquireWriteLock(); - if (log.isDebugEnabled()) { - log.debug(String.format("Delegating tenant event message: %s", type)); - } - processorChain.process(type, json, null); - } finally { - TenantManager.releaseWriteLock(); + // Delegate message to message processor chain + if (log.isDebugEnabled()) { + log.debug(String.format("Delegating tenant event message: %s", type)); } - + processorChain.process(type, json, null); } catch (Exception e) { log.error("Failed to retrieve tenant event message", e); } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2dbf5598/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageListener.java index f90c6cd..79af20e 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageListener.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageListener.java @@ -45,7 +45,7 @@ public class TenantEventMessageListener implements MessageListener { log.debug(String.format("Tenant message received: %s", ((TextMessage) message).getText())); } // Add received message to the queue - TopologyEventMessageQueue.getInstance().add(receivedMessage); + TenantEventMessageQueue.getInstance().add(receivedMessage); } catch (JMSException e) { log.error(e.getMessage(), e);
