gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-29 00:38:51 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

CLOUDSTACK-6376: Return empty list when network tier has no ACL list associated.

Browse Source
This commit is contained in:
Kishan Kavala 2014-03-04 11:18:09 +05:30
parent 635b69676a
commit 6094e00797
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -532,6 +532,11 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
if (networkId != null) {
Network network = _networkDao.findById(networkId);
aclId = network.getNetworkACLId();
if( aclId == null){
// No aclId associated with the network.
//Return empty list
return new Pair(new ArrayList<NetworkACLItem>(), 0);
}
}
if (trafficType != null) {