cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject git commit: updated refs/heads/master to e2915c6
Date Mon, 16 Dec 2013 12:43:06 GMT
Updated Branches:
  refs/heads/master 3a3fec3cb -> e2915c6ce


CLOUDSTACK-5145 : Added permission checks while deleting network ACLs


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

Branch: refs/heads/master
Commit: e2915c6ce57cf8a429a2c8a9b1980faf1c4f8574
Parents: 3a3fec3
Author: Kishan Kavala <kishan@cloud.com>
Authored: Mon Dec 16 18:12:44 2013 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Mon Dec 16 18:12:44 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2915c6c/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
index f316999..a95ef1a 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -579,10 +579,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
     @Override
     public boolean revokeNetworkACLItem(long ruleId) {
         NetworkACLItemVO aclItem = _networkACLItemDao.findById(ruleId);
-<<<<<<< HEAD
-        if (aclItem != null) {
-            if ((aclItem.getAclId() == NetworkACL.DEFAULT_ALLOW) || (aclItem.getAclId() ==
NetworkACL.DEFAULT_DENY)) {
-=======
         if(aclItem != null){
             NetworkACL acl = _networkAclMgr.getNetworkACL(aclItem.getAclId());
 
@@ -593,7 +589,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
             _accountMgr.checkAccess(caller, null, true, vpc);
 
             if((aclItem.getAclId() == NetworkACL.DEFAULT_ALLOW) || (aclItem.getAclId() ==
NetworkACL.DEFAULT_DENY)){
->>>>>>> e2805b8... CLOUDSTACK-5145 : Added permission checks while deleting
network ACLs
                 throw new InvalidParameterValueException("ACL Items in default ACL cannot
be deleted");
             }
         }


Mime
View raw message