cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject git commit: updated refs/heads/4.4-forward to 81adee3
Date Thu, 24 Apr 2014 19:45:06 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward bc3a8378d -> 81adee346


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


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/81adee34
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/81adee34
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/81adee34

Branch: refs/heads/4.4-forward
Commit: 81adee346cd5135234207717d0243d174e0f116c
Parents: bc3a837
Author: Prachi Damle <prachi@cloud.com>
Authored: Thu Apr 24 12:42:40 2014 -0700
Committer: Prachi Damle <prachi@cloud.com>
Committed: Thu Apr 24 12:42:40 2014 -0700

----------------------------------------------------------------------
 .../plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81adee34/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java
----------------------------------------------------------------------
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 77e588b..f9f76c1 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());


Mime
View raw message