From 549c64638975287f425339b5ab635e6770577fc8 Mon Sep 17 00:00:00 2001 From: Jozef Bacigal Date: Wed, 20 Jul 2016 11:38:34 +0200 Subject: [PATCH] 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 --- .../impl/registry/flow/FlowRegistryKeyFactory.java | 2 -- 1 file changed, 2 deletions(-) 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 c5acfa0b76..1a9948a2bd 100644 --- 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; } -- 2.36.6