Bug 4614 - Reintroduce xid check for correct RPC handling

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / core / connection / RpcResponseKey.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/RpcResponseKey.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/RpcResponseKey.java
index 067c5603116ffbfcaaaf00d65416ef2c937ec451..050f3cf76bdaea0261a94c48dadeade37db35c77 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/RpcResponseKey.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/RpcResponseKey.java
@@ -15,7 +15,7 @@ package org.opendaylight.openflowjava.protocol.impl.core.connection;
  * @author mirehak
  */
 public class RpcResponseKey {
-    
+
     private final long xid;
     private final String outputClazz;
     /**
@@ -26,7 +26,7 @@ public class RpcResponseKey {
         this.xid = xid;
         this.outputClazz = outputClazz;
     }
-    
+
     /**
      * @return the xid
      */
@@ -40,7 +40,7 @@ public class RpcResponseKey {
     public String getOutputClazz() {
         return outputClazz;
     }
-    
+
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -68,8 +68,8 @@ public class RpcResponseKey {
             }
         } else if (!outputClazz.equals(other.outputClazz)) {
             return false;
-//        if (xid != other.xid)
-//            return false;
+        } else if (xid != other.getXid()) {
+            return false;
         }
         return true;
     }