You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/05/13 18:39:10 UTC
stratos git commit: Revert member id change since it is not required
Repository: stratos
Updated Branches:
refs/heads/master 5d97a58c5 -> 2a952d89e
Revert member id change since it is not required
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2a952d89
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2a952d89
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2a952d89
Branch: refs/heads/master
Commit: 2a952d89e9ab043cba6169c0c010c6926ba38c95
Parents: 5d97a58
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed May 13 22:03:03 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed May 13 22:03:03 2015 +0530
----------------------------------------------------------------------
.../controller/services/impl/CloudControllerServiceImpl.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/2a952d89/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index 9613af4..565de47 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -584,10 +584,8 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
private String generateMemberId(String clusterId) {
- UUID uuid = UUID.randomUUID();
- //We add character 'a' here since GCE does not accept names starting with integer
- String memberId = "a" + clusterId + uuid.toString();
- return memberId;
+ UUID memberId = UUID.randomUUID();
+ return clusterId + memberId.toString();
}
public boolean terminateInstanceForcefully(String memberId) {