From ec2639e8fb46dc0edef9e674b21e57e34b69fa70 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Fri, 6 Mar 2015 21:42:36 +0530
Subject: [PATCH] CLOUDSTACK-8248: loadCidrs before sending response

Fixes regression from CLOUDSTACK-6582

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

diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
index bee4018145d..9f61f08c4cb 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -600,7 +600,11 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
         }
 
         Pair<List<NetworkACLItemVO>, Integer> result = _networkACLItemDao.searchAndCount(sc, filter);
-        return new Pair<List<? extends NetworkACLItem>, Integer>(result.first(), result.second());
+        List<NetworkACLItemVO> aclItemVOs = result.first();
+        for (NetworkACLItemVO item: aclItemVOs) {
+            _networkACLItemDao.loadCidrs(item);
+        }
+        return new Pair<List<? extends NetworkACLItem>, Integer>(aclItemVOs, result.second());
     }
 
     @Override