Return-Path: 
 <commits-return-39126-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3CDBC10A94
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Thu, 13 Mar 2014 18:07:30 +0000 (UTC)
Received: (qmail 85035 invoked by uid 500); 13 Mar 2014 18:06:47 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 84545 invoked by uid 500); 13 Mar 2014 18:06:28 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 82798 invoked by uid 99); 13 Mar 2014 18:05:50 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2014 18:05:50 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id DB50B944C03; Thu, 13 Mar 2014 18:05:48 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: mchen@apache.org
To: commits@cloudstack.apache.org
Date: Thu, 13 Mar 2014 18:06:26 -0000
Message-Id: <088b959d14b54bb986c7516e178177ed@git.apache.org>
In-Reply-To: <6b3a226c4d0c47e399cb8391b2c5754f@git.apache.org>
References: <6b3a226c4d0c47e399cb8391b2c5754f@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [39/50] [abbrv] git commit: updated refs/heads/rbac to 99bdc8d

CLOUDSTACK-6231 allow for cidr list entry of more than 256 chars

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

Branch: refs/heads/rbac
Commit: 1dc2bbdc37faa9cb007c3e0446efc078255f3f76
Parents: 8937434
Author: Daan Hoogland <dhoogland@schubergphilis.com>
Authored: Wed Mar 12 15:50:43 2014 +0100
Committer: Daan Hoogland <dhoogland@schubergphilis.com>
Committed: Wed Mar 12 15:50:43 2014 +0100

----------------------------------------------------------------------
 .../src/com/cloud/network/vpc/NetworkACLItemVO.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1dc2bbdc/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
index 24ec1b9..8031b00 100644
--- a/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
+++ b/engine/schema/src/com/cloud/network/vpc/NetworkACLItemVO.java
@@ -71,7 +71,7 @@ public class NetworkACLItemVO implements NetworkACLItem {
     @Enumerated(value = EnumType.STRING)
     TrafficType trafficType;
 
-    @Column(name = "cidr")
+    @Column(name = "cidr", length = 2048)
     String sourceCidrs;
 
     @Column(name = "uuid")
@@ -88,20 +88,20 @@ public class NetworkACLItemVO implements NetworkACLItem {
     protected boolean display = true;
 
     public NetworkACLItemVO() {
-        this.uuid = UUID.randomUUID().toString();
+        uuid = UUID.randomUUID().toString();
     }
 
     public NetworkACLItemVO(Integer portStart, Integer portEnd, String protocol, long aclId, List<String> sourceCidrs, Integer icmpCode, Integer icmpType,
             TrafficType trafficType, Action action, int number) {
-        this.sourcePortStart = portStart;
-        this.sourcePortEnd = portEnd;
+        sourcePortStart = portStart;
+        sourcePortEnd = portEnd;
         this.protocol = protocol;
         this.aclId = aclId;
-        this.state = State.Staged;
+        state = State.Staged;
         this.icmpCode = icmpCode;
         this.icmpType = icmpType;
         setSourceCidrList(sourceCidrs);
-        this.uuid = UUID.randomUUID().toString();
+        uuid = UUID.randomUUID().toString();
         this.trafficType = trafficType;
         this.action = action;
         this.number = number;
@@ -191,7 +191,7 @@ public class NetworkACLItemVO implements NetworkACLItem {
 
     @Override
     public String getUuid() {
-        return this.uuid;
+        return uuid;
     }
 
     @Override