You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2014/05/08 08:04:43 UTC
git commit: fix subscription domain events processors
Repository: incubator-stratos
Updated Branches:
refs/heads/master 1ff07c620 -> f11734824
fix subscription domain events processors
Signed-off-by: Manula Thantriwatte <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f1173482
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f1173482
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f1173482
Branch: refs/heads/master
Commit: f1173482499ce3c739a6d963351f16154a4a4bf1
Parents: 1ff07c6
Author: Akila Perera <ra...@gmail.com>
Authored: Thu May 8 11:20:31 2014 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Thu May 8 06:04:10 2014 +0000
----------------------------------------------------------------------
.../tenant/SubscriptionDomainAddedMessageProcessor.java | 5 ++---
.../tenant/SubscriptionDomainRemovedMessageProcessor.java | 9 ++++-----
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f1173482/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/SubscriptionDomainAddedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/SubscriptionDomainAddedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/SubscriptionDomainAddedMessageProcessor.java
index 3c3269f..8952b71 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/SubscriptionDomainAddedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/SubscriptionDomainAddedMessageProcessor.java
@@ -25,13 +25,12 @@ import org.apache.stratos.messaging.domain.tenant.Subscription;
import org.apache.stratos.messaging.domain.tenant.SubscriptionDomain;
import org.apache.stratos.messaging.domain.tenant.Tenant;
import org.apache.stratos.messaging.event.tenant.SubscriptionDomainAddedEvent;
-import org.apache.stratos.messaging.event.tenant.TenantSubscribedEvent;
import org.apache.stratos.messaging.message.processor.MessageProcessor;
import org.apache.stratos.messaging.message.receiver.tenant.TenantManager;
import org.apache.stratos.messaging.util.Util;
/**
- * Tenant subscribed message processor for adding domains to tenant subscriptions.
+ * Subscription domain added message processor for adding domains to tenant subscriptions.
*/
public class SubscriptionDomainAddedMessageProcessor extends MessageProcessor {
@@ -53,7 +52,7 @@ public class SubscriptionDomainAddedMessageProcessor extends MessageProcessor {
}
// Parse complete message and build event
- SubscriptionDomainAddedEvent event = (SubscriptionDomainAddedEvent) Util.jsonToObject(message, TenantSubscribedEvent.class);
+ SubscriptionDomainAddedEvent event = (SubscriptionDomainAddedEvent) Util.jsonToObject(message, SubscriptionDomainAddedEvent.class);
try {
TenantManager.acquireWriteLock();
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f1173482/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/SubscriptionDomainRemovedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/SubscriptionDomainRemovedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/SubscriptionDomainRemovedMessageProcessor.java
index 9ec41a1..5c46655 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/SubscriptionDomainRemovedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/SubscriptionDomainRemovedMessageProcessor.java
@@ -23,14 +23,13 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.messaging.domain.tenant.Subscription;
import org.apache.stratos.messaging.domain.tenant.Tenant;
-import org.apache.stratos.messaging.event.tenant.SubscriptionDomainAddedEvent;
-import org.apache.stratos.messaging.event.tenant.TenantSubscribedEvent;
+import org.apache.stratos.messaging.event.tenant.SubscriptionDomainRemovedEvent;
import org.apache.stratos.messaging.message.processor.MessageProcessor;
import org.apache.stratos.messaging.message.receiver.tenant.TenantManager;
import org.apache.stratos.messaging.util.Util;
/**
- * Tenant subscribed message processor for removing domains from tenant subscriptions.
+ * Subscription domain removed message processor for removing domains from tenant subscriptions.
*/
public class SubscriptionDomainRemovedMessageProcessor extends MessageProcessor {
@@ -45,14 +44,14 @@ public class SubscriptionDomainRemovedMessageProcessor extends MessageProcessor
@Override
public boolean process(String type, String message, Object object) {
- if (SubscriptionDomainAddedEvent.class.getName().equals(type)) {
+ if (SubscriptionDomainRemovedEvent.class.getName().equals(type)) {
// Return if tenant manager has not initialized
if(!TenantManager.getInstance().isInitialized()) {
return false;
}
// Parse complete message and build event
- SubscriptionDomainAddedEvent event = (SubscriptionDomainAddedEvent) Util.jsonToObject(message, TenantSubscribedEvent.class);
+ SubscriptionDomainRemovedEvent event = (SubscriptionDomainRemovedEvent) Util.jsonToObject(message, SubscriptionDomainRemovedEvent.class);
try {
TenantManager.acquireWriteLock();