etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

temp changes

This commit is contained in:
Kishan Kavala 2012-11-08 23:37:30 +05:30
parent c40aac0add
commit f365426b99
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/com/cloud/region/RegionManagerImpl.java
View File

@ -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;
}
}

4
server/src/com/cloud/user/AccountManagerImpl.java
View File

@ -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);