From aca0f7959274d4cc3d6a8a727c65977952d66dce Mon Sep 17 00:00:00 2001 From: Jayapal Date: Mon, 15 Dec 2014 15:41:30 +0530 Subject: [PATCH] CLOUDSTACK-8072: Fixed NPE in deleting default ACL items in default ACL --- .../src/com/cloud/network/vpc/NetworkACLServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java index 51bb71f7eb4..bee4018145d 100644 --- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java +++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java @@ -612,13 +612,14 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ Vpc vpc = _entityMgr.findById(Vpc.class, acl.getVpcId()); + if((aclItem.getAclId() == NetworkACL.DEFAULT_ALLOW) || (aclItem.getAclId() == NetworkACL.DEFAULT_DENY)){ + throw new InvalidParameterValueException("ACL Items in default ACL cannot be deleted"); + } + Account caller = CallContext.current().getCallingAccount(); _accountMgr.checkAccess(caller, null, true, vpc); - if((aclItem.getAclId() == NetworkACL.DEFAULT_ALLOW) || (aclItem.getAclId() == NetworkACL.DEFAULT_DENY)){ - throw new InvalidParameterValueException("ACL Items in default ACL cannot be deleted"); - } } return _networkAclMgr.revokeNetworkACLItem(ruleId); }