cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [27/40] git commit: updated refs/heads/master to f4133a7
Date Thu, 18 Dec 2014 11:56:47 GMT
CLOUDSTACK-8077: Not able to deploy VM using a shared template.


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

Branch: refs/heads/master
Commit: 9fb654cbad3ecd5e4a393f41ee5a6ad44c15680f
Parents: 20777ec
Author: Min Chen <min.chen@citrix.com>
Authored: Tue Dec 16 15:54:45 2014 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Tue Dec 16 16:40:37 2014 -0800

----------------------------------------------------------------------
 server/src/com/cloud/vm/UserVmManagerImpl.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9fb654cb/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 7c60d4a..4e64524 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2784,10 +2784,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager,
Vir
         }
 
         // Check templates permissions
-        if (!template.isPublicTemplate()) {
-            Account templateOwner = _accountMgr.getAccount(template.getAccountId());
-            _accountMgr.checkAccess(owner, null, true, templateOwner);
-        }
+        _accountMgr.checkAccess(owner, AccessType.UseEntry, false, template);
 
         // check if the user data is correct
         validateUserData(userData, httpmethod);


Mime
View raw message