You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/11/02 16:30:47 UTC
[06/50] [abbrv] stratos git commit: Revert "Update cartridge uuid
with type and tenant-id"
Revert "Update cartridge uuid with type and tenant-id"
This reverts commit d8e7c53c70bec75f6523a486778b4b99a988496f.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4affcef0
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4affcef0
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4affcef0
Branch: refs/heads/master
Commit: 4affcef090f2948a5150b7dfc2bb0144e2e54f4e
Parents: 986684d
Author: gayangunarathne <ga...@wso2.com>
Authored: Mon Nov 2 16:54:20 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Mon Nov 2 16:54:20 2015 +0530
----------------------------------------------------------------------
.../java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4affcef0/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 77dd8ba..1192db9 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,13 +291,11 @@ 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());