Repository: cloudstack Updated Branches: refs/heads/4.4 936d88382 -> 9ea3bd23e
CLOUDSTACK-8248: loadCidrs before sending response Fixes regression from CLOUDSTACK-6582 Signed-off-by: Rohit Yadav <[email protected]> (cherry picked from commit f9090eacd6432856ca7504ebdfce38d65f8d019d) Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9ea3bd23 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9ea3bd23 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9ea3bd23 Branch: refs/heads/4.4 Commit: 9ea3bd23ec77e8a26c4dcad1cb2bae943d66d3ee Parents: 936d883 Author: Rohit Yadav <[email protected]> Authored: Fri Mar 6 21:42:36 2015 +0530 Committer: Rohit Yadav <[email protected]> Committed: Fri Mar 6 21:44:08 2015 +0530 ---------------------------------------------------------------------- server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ea3bd23/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 51bb71f..81a5ce8 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
