Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0D133E2EA for ; Fri, 1 Feb 2013 06:32:25 +0000 (UTC) Received: (qmail 66048 invoked by uid 500); 1 Feb 2013 06:32:20 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 65344 invoked by uid 500); 1 Feb 2013 06:32:20 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 58847 invoked by uid 99); 1 Feb 2013 06:32:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 06:32:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 640B5828C27; Fri, 1 Feb 2013 06:32:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kishan@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [16/40] git commit: refs/heads/master - temp changes Message-Id: <20130201063204.640B5828C27@tyr.zones.apache.org> Date: Fri, 1 Feb 2013 06:32:04 +0000 (UTC) temp changes Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f365426b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f365426b Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f365426b Branch: refs/heads/master Commit: f365426b99b5e395b6ffe3fc19b81ec5a63afa43 Parents: c40aac0 Author: Kishan Kavala Authored: Thu Nov 8 23:37:30 2012 +0530 Committer: Kishan Kavala Committed: Thu Nov 8 23:37:30 2012 +0530 ---------------------------------------------------------------------- server/src/com/cloud/region/RegionManagerImpl.java | 5 +++-- server/src/com/cloud/user/AccountManagerImpl.java | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f365426b/server/src/com/cloud/region/RegionManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/region/RegionManagerImpl.java b/server/src/com/cloud/region/RegionManagerImpl.java index 0311780..3797ea1 100755 --- a/server/src/com/cloud/region/RegionManagerImpl.java +++ b/server/src/com/cloud/region/RegionManagerImpl.java @@ -289,6 +289,7 @@ public class RegionManagerImpl implements RegionManager, RegionService, Manager{ @Override public boolean removeRegion(int id) { + //Remove complete row, instead of soft delete RegionVO region = _regionDao.findById(id); if(region != null){ return _regionDao.remove(id); @@ -469,10 +470,10 @@ public class RegionManagerImpl implements RegionManager, RegionService, Manager{ //First delete in the Region where account is created Region region = _regionDao.findById(regionId); if (RegionsApiUtil.makeAPICall(region, command, params)) { - s_logger.debug("Successfully deleted user :"+userUUID+" in Region: "+region.getId()); + s_logger.debug("Successfully deleted user :"+userUUID+" in source Region: "+region.getId()); return true; } else { - s_logger.error("Error while deleting user :"+userUUID+" in Region: "+region.getId()); + s_logger.error("Error while deleting user :"+userUUID+" in source Region: "+region.getId()); return false; } } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f365426b/server/src/com/cloud/user/AccountManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 7d36d54..b72a8ac 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -1937,6 +1937,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag @Override @DB public String[] createApiKeyAndSecretKey(RegisterCmd cmd) { + //Send keys to other Regions Long userId = cmd.getId(); if (getUserIncludingRemoved(userId) == null) { @@ -2381,6 +2382,9 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag @Override public User findUser(String username, Long domainId) { UserAccount userAccount = _userAccountDao.getUserAccount(username, domainId); + if(userAccount == null){ + throw new InvalidParameterValueException("Unable to find user account by name: "+username); + } User user = _userDao.findById(userAccount.getId()); if(user == null){ throw new InvalidParameterValueException("Unable to find user by name: "+username);