From 6435991086cb30f460ce79b2bc36a880bffae445 Mon Sep 17 00:00:00 2001
From: Kris McQueen <kris@cloud.com>
Date: Thu, 28 Oct 2010 14:32:02 -0700
Subject: [PATCH] bug 6782:  somehow in my testing I missed this exception when
 creating the event for USER_DELETE.  The change is to get the userAccount by
 'idIncludingRemoved' just like getting the account.  The proper userAccount
 object is returned and the event is successfully created.

status 6782: resolved fixed
---
 server/src/com/cloud/server/ManagementServerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index b4ae499ddab..7704d10a203 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -805,7 +805,7 @@ public class ManagementServerImpl implements ManagementServer {
             }
 
             accountId = user.getAccountId();
-            userAccount = _userAccountDao.findById(userId);
+            userAccount = _userAccountDao.findByIdIncludingRemoved(userId);
 
             List<UserVO> users = _userDao.listByAccount(accountId);
             if (users.size() != 0) {