cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject git commit: updated refs/heads/4.4 to 3661e67
Date Tue, 08 Apr 2014 05:31:54 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 f29e4e21e -> 3661e67fd


CLOUDSTACK-6350: IAM - Listing of VM using uuid when owner account of
this Vm is deleted results is VM not being returned.But list VM with
listAll=true is able to return this VM.

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

Branch: refs/heads/4.4
Commit: 3661e67fd13c66ec7ec9547647bfc05296279196
Parents: f29e4e2
Author: Min Chen <min.chen@citrix.com>
Authored: Mon Apr 7 22:23:21 2014 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Mon Apr 7 22:23:21 2014 -0700

----------------------------------------------------------------------
 server/src/com/cloud/user/AccountManagerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3661e67f/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 047f547..0d4b72d 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -2231,8 +2231,8 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager,
M
                 owner = caller;
             }
             AccessType accessType = AccessType.UseEntry;
-            if (listAll) {
-                // listAll = true should show all resources that owner has ListEntry access
type
+            if (listAll || id != null) {
+                // listAll = true or id given should show all resources that owner has ListEntry
access type.
                 accessType = AccessType.ListEntry;
             }
             domainIdRecursiveListProject.third(Project.ListProjectResourcesCriteria.SkipProjectResources);


Mime
View raw message