Repository: stratos Updated Branches: refs/heads/tenant-isolation 2abd651f1 -> ff6c34aae
Update the references with UUID Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ff6c34aa Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ff6c34aa Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ff6c34aa Branch: refs/heads/tenant-isolation Commit: ff6c34aae403a2aa1d88078a07f9b2e996f50343 Parents: 2abd651 Author: Gayan Gunarathne <[email protected]> Authored: Tue Jul 14 20:13:22 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Tue Jul 14 20:13:22 2015 +0530 ---------------------------------------------------------------------- .../status/processor/group/GroupStatusInactiveProcessor.java | 2 +- .../apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ff6c34aa/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java index 7706bb8..a3c97d3 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInactiveProcessor.java @@ -132,7 +132,7 @@ public class GroupStatusInactiveProcessor extends GroupStatusProcessor { String instanceId) { for (Map.Entry<String, ClusterDataHolder> clusterDataHolderEntry : clusterData.entrySet()) { Service service = TopologyManager.getTopology(). - getService(clusterDataHolderEntry.getValue().getServiceType()); + getService(clusterDataHolderEntry.getValue().getServiceUuid()); Cluster cluster = service.getCluster(clusterDataHolderEntry.getValue().getClusterId()); ClusterInstance context = cluster.getInstanceContexts(instanceId); if (context != null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/ff6c34aa/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 e424bbd..f246e67 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 @@ -2096,15 +2096,15 @@ public class StratosApiV41Utils { for (Map.Entry<String, ClusterDataHolder> entry : topLevelClusterDataMap.entrySet()) { ClusterDataHolder clusterDataHolder = entry.getValue(); String clusterId = clusterDataHolder.getClusterId(); - String serviceType = clusterDataHolder.getServiceType(); + String serviceTypeUuid = clusterDataHolder.getServiceUuid(); try { - TopologyManager.acquireReadLockForCluster(serviceType, clusterId); - Cluster topLevelCluster = TopologyManager.getTopology().getService(serviceType).getCluster(clusterId); + TopologyManager.acquireReadLockForCluster(serviceTypeUuid, clusterId); + Cluster topLevelCluster = TopologyManager.getTopology().getService(serviceTypeUuid).getCluster(clusterId); groupInstanceBean.getClusterInstances().add(ObjectConverter. convertClusterToClusterInstanceBean(groupInstanceBean.getInstanceId(), topLevelCluster, entry.getKey())); } finally { - TopologyManager.releaseReadLockForCluster(serviceType, clusterId); + TopologyManager.releaseReadLockForCluster(serviceTypeUuid, clusterId); } } }
