back-port old commit
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b9365d91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b9365d91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b9365d91 Branch: refs/heads/master Commit: b9365d914d7aaf7725324ee1e50a675583180310 Parents: 21aadd0 Author: Nirmal Fernando <[email protected]> Authored: Thu Nov 28 00:15:31 2013 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Thu Nov 28 00:15:31 2013 +0530 ---------------------------------------------------------------------- .../stratos/adc/mgt/utils/ApplicationManagementUtil.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b9365d91/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java index a5c3437..15ab57c 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java @@ -550,7 +550,8 @@ public class ApplicationManagementUtil { String mgtClusterDomain, String mgtClusterSubDomain, DataCartridge dataCartridge, - String state) { + String state, + String subscribeKey) { CartridgeSubscriptionInfo cartridgeSubscriptionInfo = new CartridgeSubscriptionInfo(); cartridgeSubscriptionInfo.setCartridge(cartridgeType); @@ -570,11 +571,13 @@ public class ApplicationManagementUtil { cartridgeSubscriptionInfo.setBaseDirectory(cartridgeInfo.getBaseDir()); //cartridgeSubscriptionInfo.setState("PENDING"); cartridgeSubscriptionInfo.setState(state); + cartridgeSubscriptionInfo.setSubscriptionKey(subscribeKey); return cartridgeSubscriptionInfo; } - private static List<PortMapping> createPortMappings(CartridgeInfo cartridgeInfo) { + + private static List<PortMapping> createPortMappings(CartridgeInfo cartridgeInfo) { List<PortMapping> portMappings = new ArrayList<PortMapping>(); if (cartridgeInfo.getPortMappings() != null) {
