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/07/21 08:58:32 UTC

[1/2] git commit: persisting subscriptions in a synchronized block

Repository: stratos
Updated Branches:
  refs/heads/4.0.0-grouping e975f1d68 -> 60c1483e8


persisting subscriptions in a synchronized block


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4a14d93e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4a14d93e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4a14d93e

Branch: refs/heads/4.0.0-grouping
Commit: 4a14d93ed529ad57ad5dbf1530139c8a0679a8cc
Parents: f2e8410
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Mon Jul 21 12:27:20 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Mon Jul 21 12:27:20 2014 +0530

----------------------------------------------------------------------
 .../application/CompositeApplicationManager.java     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/4a14d93e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java
index b4db5de..e764de2 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java
@@ -105,9 +105,8 @@ public class CompositeApplicationManager {
 
         // TODO: send the Composite App structure to CC
 
-        persistCartridgeSubscriptions(aliasToCartridgeSubscription.values());
-        persistGroupSubscriptions(groupAliasToGroupSubscription.values());
-        persistCompositeAppSubscription(compositeAppSubscription);
+        // persist
+        persistSubscriptions(aliasToCartridgeSubscription.values(), groupAliasToGroupSubscription.values(), compositeAppSubscription);
 	}
 
     private Set<String> getCartrigdeSubscriptionAliases (Set<SubscribableContext> subscribableContexts) throws CompositeApplicationException {
@@ -257,6 +256,16 @@ public class CompositeApplicationManager {
         return groupAliasToGroupSubscription.get(newGroupSubscriptionAlias) != null;
     }
 
+    private synchronized void persistSubscriptions(Collection<CartridgeSubscription> cartridgeSubscriptions,
+                                                   Collection<GroupSubscription> groupSubscriptions,
+                                                   CompositeAppSubscription compositeAppSubscription)
+        throws CompositeApplicationException {
+
+        persistCartridgeSubscriptions(cartridgeSubscriptions);
+        persistGroupSubscriptions(groupSubscriptions);
+        persistCompositeAppSubscription(compositeAppSubscription);
+    }
+
     private void persistCartridgeSubscriptions (Collection<CartridgeSubscription> cartridgeSubscriptions) throws CompositeApplicationException {
 
         if (cartridgeSubscriptions == null) {


[2/2] git commit: Merge persisting subscriptions in a synchronized block Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping

Posted by is...@apache.org.
Merge persisting subscriptions in a synchronized block Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/60c1483e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/60c1483e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/60c1483e

Branch: refs/heads/4.0.0-grouping
Commit: 60c1483e828dc925f9ab2a9d1eb6111e74ea1d7c
Parents: 4a14d93 e975f1d
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Mon Jul 21 12:27:32 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Mon Jul 21 12:27:32 2014 +0530

----------------------------------------------------------------------
 .../application/CompositeApplicationManager.java         | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/60c1483e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java
----------------------------------------------------------------------