From f365426b99b5e395b6ffe3fc19b81ec5a63afa43 Mon Sep 17 00:00:00 2001 From: Kishan Kavala Date: Thu, 8 Nov 2012 23:37:30 +0530 Subject: [PATCH] temp changes --- server/src/com/cloud/region/RegionManagerImpl.java | 5 +++-- server/src/com/cloud/user/AccountManagerImpl.java | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/region/RegionManagerImpl.java b/server/src/com/cloud/region/RegionManagerImpl.java index 0311780125e..3797ea1d292 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; } } diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 7d36d5432f9..b72a8ac03cc 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);