Updated Branches: refs/heads/master 69ccd8803 -> fc9eb2ab6
fixing STRATOS-367 Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8157baad Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8157baad Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8157baad Branch: refs/heads/master Commit: 8157baad3cf9264f9a1e44d3cca4145037135226 Parents: af0b54d Author: rekathiru <[email protected]> Authored: Fri Jan 17 14:13:32 2014 +0530 Committer: rekathiru <[email protected]> Committed: Fri Jan 17 14:13:32 2014 +0530 ---------------------------------------------------------------------- .../manager/manager/CartridgeSubscriptionManager.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8157baad/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 7e00740..e9ea9ea 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 @@ -20,6 +20,7 @@ package org.apache.stratos.manager.manager; import org.apache.axis2.AxisFault; +import org.apache.commons.lang.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; @@ -41,6 +42,7 @@ import org.apache.stratos.manager.utils.ApplicationManagementUtil; import org.apache.stratos.manager.utils.CartridgeConstants; import org.wso2.carbon.context.CarbonContext; +import java.util.Arrays; import java.util.Collection; /** @@ -121,8 +123,12 @@ public class CartridgeSubscriptionManager { CloudControllerServiceClient.getServiceClient().getCartridgeInfo(cartridgeType); if (props != null) { // TODO: temp fix, need to do a proper fix - for (Property property : props) - cartridgeInfo.addProperties(property); + Property[] cartridgeInfoProperties = cartridgeInfo.getProperties(); + int length = cartridgeInfoProperties.length + props.length; + Property[] combined = new Property[length]; + System.arraycopy(cartridgeInfoProperties, 0, combined, 0, cartridgeInfoProperties.length); + System.arraycopy(props, 0, combined, cartridgeInfoProperties.length, props.length); + cartridgeInfo.setProperties(combined); } } catch (UnregisteredCartridgeException e) {
