You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/12/18 00:16:32 UTC
git commit: updated refs/heads/master to f4ee1a8
Updated Branches:
refs/heads/master 6d6d11f7a -> f4ee1a811
reverted 3a3fec3cb6bb4f9a008370ea02279d286654b01a because it fails a unit test
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f4ee1a81
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f4ee1a81
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f4ee1a81
Branch: refs/heads/master
Commit: f4ee1a8115cd927ce15feb9af60b18d108dcd6e7
Parents: 6d6d11f
Author: Alex Huang <al...@citrix.com>
Authored: Tue Dec 17 14:18:40 2013 -0800
Committer: Alex Huang <al...@citrix.com>
Committed: Tue Dec 17 15:16:48 2013 -0800
----------------------------------------------------------------------
.../cloud/network/vpc/NetworkACLServiceImpl.java | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4ee1a81/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 a95ef1a..ade83e3 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -23,8 +23,6 @@ import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
-import com.cloud.network.vpc.dao.VpcDao;
-import org.apache.cloudstack.api.command.user.network.ListNetworkACLListsCmd;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -32,6 +30,7 @@ import org.springframework.stereotype.Component;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.user.network.CreateNetworkACLCmd;
+import org.apache.cloudstack.api.command.user.network.ListNetworkACLListsCmd;
import org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd;
import org.apache.cloudstack.context.CallContext;
@@ -43,6 +42,7 @@ import com.cloud.network.Networks;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.vpc.dao.NetworkACLDao;
+import com.cloud.network.vpc.dao.VpcDao;
import com.cloud.network.vpc.dao.VpcGatewayDao;
import com.cloud.projects.Project.ListProjectResourcesCriteria;
import com.cloud.server.ResourceTag.ResourceObjectType;
@@ -579,16 +579,8 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
@Override
public boolean revokeNetworkACLItem(long ruleId) {
NetworkACLItemVO aclItem = _networkACLItemDao.findById(ruleId);
- if(aclItem != null){
- NetworkACL acl = _networkAclMgr.getNetworkACL(aclItem.getAclId());
-
- Vpc vpc = _entityMgr.findById(Vpc.class, acl.getVpcId());
-
- Account caller = CallContext.current().getCallingAccount();
-
- _accountMgr.checkAccess(caller, null, true, vpc);
-
- if((aclItem.getAclId() == NetworkACL.DEFAULT_ALLOW) || (aclItem.getAclId() == NetworkACL.DEFAULT_DENY)){
+ if (aclItem != null) {
+ if ((aclItem.getAclId() == NetworkACL.DEFAULT_ALLOW) || (aclItem.getAclId() == NetworkACL.DEFAULT_DENY)) {
throw new InvalidParameterValueException("ACL Items in default ACL cannot be deleted");
}
}