From 751ebce5891fefc55be53e415dbaab43b3018c12 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Wed, 1 Aug 2012 15:25:00 -0700
Subject: [PATCH] VPC: CS-15791 - allow having the same NetworkACL for 2
 different protocols

---
 server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
index 05254a7c45e..bb9d8e0b73b 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
@@ -225,8 +225,8 @@ public class NetworkACLManagerImpl implements Manager,NetworkACLManager{
         "network conflicts so we should at least have one rule at this point.";
 
         for (FirewallRuleVO rule : rules) {
-            if (rule.getId() == newRule.getId()) {
-                continue; // Skips my own rule.
+            if (rule.getId() == newRule.getId() || !rule.getProtocol().equalsIgnoreCase(newRule.getProtocol())) {
+                continue; // Skips my own rule and skip the rule if the protocol is different
             }
 
             // if one cidr overlaps another, do port veirficatino