Updated Branches: refs/heads/4.1 45c51d1fd -> dc0753497
Revert "CLOUDSTACK-1451 Pass randomly generated UUID instead of empty string when create internal account as a part of project creation. Otherwise entityexistsexception would happen when attempt to create more than 1 project in the system" This reverts commit 45c51d1fdd2b726245075f75fd8bf6ebce506787. The commit is reverted as it should go through the patch review Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/dc075349 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/dc075349 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/dc075349 Branch: refs/heads/4.1 Commit: dc075349794c72954ae85c5b4eefe93c0c32a83e Parents: 45c51d1 Author: Alena Prokharchyk <[email protected]> Authored: Thu Mar 7 11:41:27 2013 -0800 Committer: Alena Prokharchyk <[email protected]> Committed: Thu Mar 7 11:41:27 2013 -0800 ---------------------------------------------------------------------- .../src/com/cloud/projects/ProjectManagerImpl.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dc075349/server/src/com/cloud/projects/ProjectManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/projects/ProjectManagerImpl.java b/server/src/com/cloud/projects/ProjectManagerImpl.java index 33feb5d..45a9a24 100755 --- a/server/src/com/cloud/projects/ProjectManagerImpl.java +++ b/server/src/com/cloud/projects/ProjectManagerImpl.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.Properties; import java.util.Random; import java.util.TimeZone; -import java.util.UUID; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -205,7 +204,7 @@ public class ProjectManagerImpl extends ManagerBase implements ProjectManager { StringBuilder acctNm = new StringBuilder("PrjAcct-"); acctNm.append(name).append("-").append(owner.getDomainId()); - Account projectAccount = _accountMgr.createAccount(acctNm.toString(), Account.ACCOUNT_TYPE_PROJECT, domainId, null, null, UUID.randomUUID().toString(), 0); + Account projectAccount = _accountMgr.createAccount(acctNm.toString(), Account.ACCOUNT_TYPE_PROJECT, domainId, null, null, "", 0); Project project = _projectDao.persist(new ProjectVO(name, displayText, owner.getDomainId(), projectAccount.getId()));
