You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2014/04/10 12:06:46 UTC
[3/3] git commit: updated refs/heads/4.4 to 6094e00
CLOUDSTACK-6376: Return empty list when network tier has no ACL list associated.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6094e007
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6094e007
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6094e007
Branch: refs/heads/4.4
Commit: 6094e007978df664b9312ca2d45989614090ba87
Parents: 635b696
Author: Kishan Kavala <ki...@cloud.com>
Authored: Tue Mar 4 11:18:09 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Thu Apr 10 15:29:01 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6094e007/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 d2aa617..72996d1 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -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) {