Updated Branches: refs/heads/master bd2924923 -> dac753c2f
fixing a bug in removing Subscriptions from cluster id -> set<subscription> map Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b23f2025 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b23f2025 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b23f2025 Branch: refs/heads/master Commit: b23f20257ead8ecba56a2c29c6568b1dd44858c2 Parents: ba47789 Author: Isuru <[email protected]> Authored: Wed Jan 8 18:28:51 2014 +0530 Committer: Isuru <[email protected]> Committed: Wed Jan 8 18:28:51 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/manager/lookup/ClusterIdToSubscription.java | 4 ++-- .../java/org/apache/stratos/manager/lookup/LookupDataHolder.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b23f2025/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/ClusterIdToSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/ClusterIdToSubscription.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/ClusterIdToSubscription.java index d9f0cf2..562c682 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/ClusterIdToSubscription.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/ClusterIdToSubscription.java @@ -68,7 +68,7 @@ public class ClusterIdToSubscription implements Serializable { return clusterIdToCartridgeSubscription.get(clusterId); } - public void removeSubscription (String clusterId) { + public void removeSubscription (String clusterId, String subscriptionAlias) { /*if (clusterIdToCartridgeSubscription.remove(clusterId) != null) { if (log.isDebugEnabled()) { @@ -83,7 +83,7 @@ public class ClusterIdToSubscription implements Serializable { while (iterator.hasNext()) { CartridgeSubscription cartridgeSubscription = iterator.next(); // if a matching CartridgeSubscription is found, remove - if (cartridgeSubscription.getClusterDomain().equals(clusterId)) { + if (cartridgeSubscription.getAlias().equals(subscriptionAlias)) { iterator.remove(); if (log.isDebugEnabled()) { log.debug("Deleted the subscription for cluster id " + clusterId + " from [Cluster Id -> Set<CartridgeSubscription>] map"); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b23f2025/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/LookupDataHolder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/LookupDataHolder.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/LookupDataHolder.java index 64717b6..f7a7c34 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/LookupDataHolder.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lookup/LookupDataHolder.java @@ -86,7 +86,7 @@ public class LookupDataHolder implements Serializable { public void removeSubscription (int tenantId, String type, String subscriptionAlias, String clusterId) { tenantIdToSubscriptionContext.removeSubscriptionContext(tenantId, type, subscriptionAlias); - clusterIdToSubscription.removeSubscription(clusterId); + clusterIdToSubscription.removeSubscription(clusterId, subscriptionAlias); } public Collection<CartridgeSubscription> getSubscriptions (int tenantId) {
