Repository: stratos Updated Branches: refs/heads/master 409e53d89 -> d8e7c53c7
Update cartridge uuid with type and tenant-id Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d8e7c53c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d8e7c53c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d8e7c53c Branch: refs/heads/master Commit: d8e7c53c70bec75f6523a486778b4b99a988496f Parents: 409e53d Author: gayangunarathne <[email protected]> Authored: Sat Sep 5 22:39:11 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Sat Sep 5 22:39:11 2015 +0530 ---------------------------------------------------------------------- .../java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d8e7c53c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index 1192db9..77dd8ba 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -291,11 +291,13 @@ public class StratosApiV41 extends AbstractApi { CartridgeBean cartridgeDefinitionBean) throws RestAPIException { String cartridgeType = cartridgeDefinitionBean.getType(); - String cartridgeUuid = UUID.randomUUID().toString(); + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); int tenantId = carbonContext.getTenantId(); + String cartridgeUuid = cartridgeType + "~" +tenantId;//UUID.randomUUID().toString() + CartridgeBean cartridgeBean = null; try { cartridgeBean = StratosApiV41Utils.getCartridgeForValidate(cartridgeType, carbonContext.getTenantId());
