cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [2/2] git commit: updated refs/heads/4.4-forward to 4c30432
Date Tue, 06 May 2014 20:30:08 GMT
fixed network acl cidr issues


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4c304324
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4c304324
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4c304324

Branch: refs/heads/4.4-forward
Commit: 4c304324a36ad25d7756da1ca9f2426a96ad8837
Parents: 0c0a0c2
Author: Jayapal <jayapal@apache.org>
Authored: Tue May 6 17:59:53 2014 +0200
Committer: Daan Hoogland <daan@onecht.net>
Committed: Tue May 6 22:29:42 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c304324/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java
----------------------------------------------------------------------
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 c940247..abd8bae 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;
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c304324/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index d49f4d4..d0dd073 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,


Mime
View raw message