You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/01/08 13:59:14 UTC
[1/2] git commit: fixing a bug in removing Subscriptions from cluster
id -> set map
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 <is...@wso2.com>
Authored: Wed Jan 8 18:28:51 2014 +0530
Committer: Isuru <is...@wso2.com>
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) {
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by is...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/dac753c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/dac753c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/dac753c2
Branch: refs/heads/master
Commit: dac753c2f8a30c3181e755f6938ab46e4167f366
Parents: b23f202 bd29249
Author: Isuru <is...@wso2.com>
Authored: Wed Jan 8 18:29:00 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Wed Jan 8 18:29:00 2014 +0530
----------------------------------------------------------------------
.../controller/registry/RegistryManager.java | 10 ++++
.../distribution/src/main/assembly/bin.xml | 46 ++++++++++++++-
.../distribution/src/main/conf/jndi.properties | 1 -
.../distribution/src/main/assembly/bin.xml | 2 +-
.../src/main/bin/cartridge-agent.sh | 43 --------------
.../distribution/src/main/bin/stratos.sh | 43 ++++++++++++++
.../src/main/resources/jndi.properties | 1 -
.../distribution/src/main/assembly/bin.xml | 60 ++++++++++++++------
.../distribution/src/main/conf/jndi.properties | 1 -
.../distribution/src/main/assembly/bin.xml | 47 ++++++++++++---
products/stratos-manager/conf/jndi.properties | 1 -
.../modules/distribution/src/assembly/bin.xml | 51 +++++++++++++++--
12 files changed, 223 insertions(+), 83 deletions(-)
----------------------------------------------------------------------