Rebase with stratos 4.1.x
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1ae9bb39 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1ae9bb39 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1ae9bb39 Branch: refs/heads/master Commit: 1ae9bb392761f5353cd8c50579a27a0362db6c64 Parents: 8772221 Author: gayangunarathne <[email protected]> Authored: Tue Dec 8 19:03:09 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Tue Dec 8 19:03:09 2015 +0530 ---------------------------------------------------------------------- .../messaging/topology/TopologyHolder.java | 14 + .../rest/endpoint/api/StratosApiV41Utils.java | 4 +- .../src/main/resources/AutoscalerService.wsdl | 622 ++++++++--------- .../main/resources/CloudControllerService.wsdl | 698 +++++++++---------- .../main/resources/StratosManagerService.wsdl | 384 +++++----- 5 files changed, 898 insertions(+), 824 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/1ae9bb39/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyHolder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyHolder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyHolder.java index ae939c8..d183ca0 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyHolder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyHolder.java @@ -40,6 +40,20 @@ public class TopologyHolder { private TopologyHolder() { } + public static void acquireReadLock() { + lock.acquireReadLock(); + if (log.isDebugEnabled()) { + log.debug("Read lock acquired"); + } + } + + public static void releaseReadLock() { + lock.releaseReadLock(); + if (log.isDebugEnabled()) { + log.debug("Read lock released"); + } + } + public static void acquireWriteLock() { lock.acquireWriteLock(); if (log.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/stratos/blob/1ae9bb39/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 4c6eb1e..ffe2a24 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 @@ -1844,7 +1844,7 @@ public class StratosApiV41Utils { if (applicationDefinition.isMultiTenant()) { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); boolean hasSignUps = StratosManagerServiceClient.getInstance(). - applicationSignUpsExist(applicationDefinition.getApplicationId()); + applicationSignUpExist(applicationDefinition.getApplicationId(), tenantId); applicationDefinition.setSignUpsExist(hasSignUps); } applicationDefinitions.add(applicationDefinition); @@ -2065,7 +2065,7 @@ public class StratosApiV41Utils { * @param group Group * @param groupInstanceBean GroupInstanceBean */ - private static void setSubGroupInstances(Group group, GroupInstanceBean groupInstanceBean) throws RestAPIException { + private static void setSubGroupInstances(Group group, GroupInstanceBean groupInstanceBean) { Collection<Group> subgroups = group.getGroups(); addClustersInstancesToGroupInstanceBean(groupInstanceBean, group); if (subgroups != null && !subgroups.isEmpty()) {
