Repository: stratos Updated Branches: refs/heads/tenant-isolation 61a73fda5 -> 9e1bd91a3
Fixing a minor issue when deploying five-levels-nested-groups-app Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9e1bd91a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9e1bd91a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9e1bd91a Branch: refs/heads/tenant-isolation Commit: 9e1bd91a39ecbe92bbe93c4ced70be7b0234153c Parents: 61a73fd Author: Dinithi <[email protected]> Authored: Fri Aug 14 17:17:36 2015 +0530 Committer: Dinithi <[email protected]> Committed: Fri Aug 14 17:17:36 2015 +0530 ---------------------------------------------------------------------- .../apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/9e1bd91a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index 417dd15..fe56191 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -1383,12 +1383,11 @@ public class StratosApiV41Utils { } String cartridgeUuid; PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - if (serviceGroup.getCartridges() != null) { + if (serviceGroup.getCartridges().length > 0) { for (String cartridgeName : serviceGroup.getCartridges()) { - cartridgeUuid = CloudControllerServiceClient.getInstance().getCartridgeByTenant(cartridgeName, - carbonContext.getTenantId()).getUuid(); if (cartridgeName != null && (!cartridgeNames.contains(cartridgeName))) { - + cartridgeUuid = CloudControllerServiceClient.getInstance().getCartridgeByTenant(cartridgeName, + carbonContext.getTenantId()).getUuid(); cartridgeNames.add(cartridgeUuid); } }
