Updated Branches: refs/heads/master fbf69efb7 -> 61caa7619
fixing cartridge properties overwriting issue - this is a temp fix, need to fix properly Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f8364b6d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f8364b6d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f8364b6d Branch: refs/heads/master Commit: f8364b6d4596976e6d72d01f2f7f8380cb2ca897 Parents: cd028a1 Author: Isuru <[email protected]> Authored: Thu Jan 16 20:10:41 2014 +0530 Committer: Isuru <[email protected]> Committed: Thu Jan 16 20:10:41 2014 +0530 ---------------------------------------------------------------------- .../stratos/manager/manager/CartridgeSubscriptionManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f8364b6d/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 65f91da..7e00740 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 @@ -120,7 +120,9 @@ public class CartridgeSubscriptionManager { cartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(cartridgeType); if (props != null) { - cartridgeInfo.setProperties(props); + // TODO: temp fix, need to do a proper fix + for (Property property : props) + cartridgeInfo.addProperties(property); } } catch (UnregisteredCartridgeException e) {
