From 7b7eb48281ed79dab7cabb512554b05ec7ae6da2 Mon Sep 17 00:00:00 2001
From: Kishan Kavala <kishan@cloud.com>
Date: Tue, 4 Mar 2014 11:18:09 +0530
Subject: [PATCH] CLOUDSTACK-6376: Return empty list when network tier has no
 ACL list associated.

(cherry picked from commit 26746feb39da6483059be7b33a2d5cd41f042c78)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
index 37f1c397075..28d8776f489 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -515,6 +515,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) {