From 980eac607f0dbb3b2c4478f75ffebb741ddc6981 Mon Sep 17 00:00:00 2001
From: Jayapal <jayapal@apache.org>
Date: Tue, 6 May 2014 17:59:53 +0200
Subject: [PATCH] CLOUDSTACK-6582: fixed network acl cidr issues

---
 .../com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java    | 6 ++++--
 setup/db/db/schema-430to440.sql                             | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
index c9402473476..abd8bae5631 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
@@ -115,7 +115,7 @@ public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long
         for(NetworkACLItemVO item :list) {
             loadCidrs(item);
         }
-        return listBy(sc);
+        return list;
     }
 
     @Override
@@ -132,7 +132,9 @@ public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long
         sc.setParameters("aclId", aclId);
         sc.setParameters("number", number);
         NetworkACLItemVO vo = findOneBy(sc);
-        loadCidrs(vo);
+        if(vo != null) {
+            loadCidrs(vo);
+        }
         return vo;
     }
 
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index d49f4d40501..d0dd07374de 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -1654,7 +1654,7 @@ CREATE TABLE `cloud`.`op_vpc_distributed_router_sequence_no` (
 
 INSERT INTO `cloud`.`configuration`(category, instance, component, name, value, description, default_value) VALUES ('Advanced', 'DEFAULT', 'NetworkOrchestrationService', 'router.aggregation.command.each.timeout', '3', 'timeout in seconds for each Virtual Router command being aggregated. The final aggregation command timeout would be determined by this timeout * commands counts ', '3') ON DUPLICATE KEY UPDATE category='Advanced';
 
-CREATE TABLE `cloud`.`network_acl_item_cidr` (
+CREATE TABLE `cloud`.`network_acl_item_cidrs` (
   `id` bigint unsigned UNIQUE NOT NULL auto_increment,
   `network_acl_item_id` bigint unsigned NOT NULL COMMENT 'Network ACL Item id',
   `cidr` varchar(255) NOT NULL,