From daa7d41650f945da7517244d9e0875a491f4df23 Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Wed, 2 Nov 2011 15:11:47 +0530
Subject: [PATCH] bug 11770: throw error when account is not found in default
 root domain status 11770: resolved fixed

---
 server/src/com/cloud/server/ManagementServerImpl.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index b6f952de6fc..a1aa48c2317 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -2106,6 +2106,14 @@ public class ManagementServerImpl implements ManagementServer {
                 }
             } else {
                 domainId = ((account == null) ? DomainVO.ROOT_DOMAIN : account.getDomainId());
+                if (accountName != null) {
+                    Account userAccount = _accountDao.findAccount(accountName, domainId);
+                    if (userAccount != null) {
+                        accountId = userAccount.getId();
+                    } else {
+                        throw new InvalidParameterValueException("Unable to find account " + accountName + " in domain " + domainId);
+                    }
+                }
             }
         } else {
             accountId = account.getId();