From 0233bc88ba08f03e0eb26105ab8b94c2800283ea Mon Sep 17 00:00:00 2001
From: Prachi Damle <prachi@cloud.com>
Date: Thu, 24 Apr 2014 12:42:40 -0700
Subject: [PATCH] CLOUDSTACK-6458: IAM - When a domain is deleted , the group
 created for this domian is not removed.

Changes:
- When domain is deleted, IAM service will not find it unless it selects using 'removed' column
---
 .../plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java b/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java
index 77e588b122a..f9f76c1baea 100644
--- a/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java
+++ b/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java
@@ -243,7 +243,7 @@ public class IAMApiServiceImpl extends ManagerBase implements IAMApiService, Man
                 Long domainId = ((Long) obj);
                 if (domainId != null) {
                     s_logger.debug("MessageBus message: Domain removed: " + domainId + ", removing the domain group");
-                    Domain domain = _domainDao.findById(domainId);
+                    Domain domain = _domainDao.findByIdIncludingRemoved(domainId);
                     List<IAMGroup> groups = listDomainGroup(domain);
                     for (IAMGroup group : groups) {
                         _iamSrv.deleteIAMGroup(group.getId());