Merge "Create empty match only once"

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / registry / flow / FlowRegistryKeyFactory.java

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 420064633eb83b1c08ca0ab99c07f3c393b73891..4130bb35ccd9732cc1cea6c40696773a5ea65ee2 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
@@ -60,7 +60,6 @@ public class FlowRegistryKeyFactory {
 
             return getPriority() == that.getPriority() &&
                     getTableId() == that.getTableId() &&
-                    getCookie().equals(that.getCookie()) &&
                     getMatch().equals(that.getMatch());
         }
 
@@ -68,7 +67,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;
         }