Revert "Merge "Bug 6235 - Cookie compare in FlowRegistryKeyFactory""

This reverts commit 9f162b87886b2bb3917fb5aa8aa3b37f49215516, reversing
changes made to 7fa33fd58abd5d38788581d9207e972dfd3eb592.

Change-Id: Icbc0738d392e0d270f033b3efb9b90cd33824fac
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowRegistryKeyFactory.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowRegistryKeyFactory.java
index c5acfa0b76b87b56f24c8a7d2dcd1847ecc8be13..1a9948a2bd1137036ce9af73f678550595784c57 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowRegistryKeyFactory.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowRegistryKeyFactory.java
@@ -59,7 +59,6 @@ public class FlowRegistryKeyFactory {
 
             return getPriority() == that.getPriority() &&
                     getTableId() == that.getTableId() &&
-                    getCookie().equals(that.getCookie()) &&
                     getMatch().equals(that.getMatch());
         }
 
@@ -67,7 +66,6 @@ public class FlowRegistryKeyFactory {
         public int hashCode() {
             int result = tableId;
             result = 31 * result + priority;
-            result = 31 * result + cookie.hashCode();
             result = 31 * result + match.hashCode();
             return result;
         }