Updated Branches: refs/heads/master f8f194503 -> 8195f2214
moving setKey before calling createSubscription Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/060df783 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/060df783 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/060df783 Branch: refs/heads/master Commit: 060df78392ea96f8e0679fb4cdb9eeb7dccd1820 Parents: a1dbda1 Author: Isuru <[email protected]> Authored: Fri Jan 10 14:54:46 2014 +0530 Committer: Isuru <[email protected]> Committed: Fri Jan 10 14:54:46 2014 +0530 ---------------------------------------------------------------------- .../stratos/manager/manager/CartridgeSubscriptionManager.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/060df783/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java index fbcb76b..65f91da 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java @@ -159,11 +159,13 @@ public class CartridgeSubscriptionManager { //Create subscriber Subscriber subscriber = new Subscriber(tenantAdminUsername, tenantId, tenantDomain); + //Set the key + cartridgeSubscription.setSubscriptionKey(CartridgeSubscriptionUtils.generateSubscriptionKey()); + //create subscription cartridgeSubscription.createSubscription(subscriber, cartridgeAlias, autoscalingPolicyName, deploymentPolicyName, repository); - cartridgeSubscription.setSubscriptionKey(CartridgeSubscriptionUtils.generateSubscriptionKey()); // TODO ---- fix - // properly + log.info("Tenant [" + tenantId + "] with username [" + tenantAdminUsername + " subscribed to " + "] Cartridge Alias " + cartridgeAlias + ", Cartridge Type: " +
