etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tweak reorder logic

This commit is contained in:
Pearl Dsilva 2024-02-06 12:40:17 -05:00
parent 71a15f4e6b
commit c839cd2645
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java
View File

@ -993,14 +993,14 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
NetworkACLVO lockedAcl = _networkACLDao.acquireInLockTable(ruleBeingMoved.getAclId()); NetworkACLVO lockedAcl = _networkACLDao.acquireInLockTable(ruleBeingMoved.getAclId());
List<NetworkACLItemVO> allAclRules = getAllAclRulesSortedByNumber(lockedAcl.getId()); List<NetworkACLItemVO> allAclRules = getAllAclRulesSortedByNumber(lockedAcl.getId());
validateAclConsistency(moveNetworkAclItemCmd, lockedAcl, allAclRules); validateAclConsistency(moveNetworkAclItemCmd, lockedAcl, allAclRules);
NetworkACLItem networkACLItem = null;
if (previousRule == null) { if (previousRule == null) {
return moveRuleToTheTop(ruleBeingMoved, allAclRules); networkACLItem = moveRuleToTheTop(ruleBeingMoved, allAclRules);
} else if (nextRule == null) {
networkACLItem = moveRuleToTheBottom(ruleBeingMoved, allAclRules);
} else {
networkACLItem = moveRuleBetweenAclRules(ruleBeingMoved, allAclRules, previousRule, nextRule);
} }
if (nextRule == null) {
return moveRuleToTheBottom(ruleBeingMoved, allAclRules);
}
NetworkACLItem networkACLItem = moveRuleBetweenAclRules(ruleBeingMoved, allAclRules, previousRule, nextRule);
VpcVO vpc = _vpcDao.findById(lockedAcl.getVpcId()); VpcVO vpc = _vpcDao.findById(lockedAcl.getVpcId());
if (Objects.isNull(vpc)) { if (Objects.isNull(vpc)) {
return networkACLItem; return networkACLItem;