BUG-86: Fixed echo response processing

Change-Id: Ib83eb3463d101e872830d3985044c1154668baa1
Signed-off-by: Jalpa Modasiya <jmodasiy@luminanetworks.com>

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImpl.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImpl.java
index 798ac79ce033a19ba48b9b0be6cc9e6e1232b335..3ea7a8d3069bf330104f95a4f6603194e634a9ee 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImpl.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImpl.java
@@ -18,6 +18,7 @@ import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueueHandle
 import org.opendaylight.openflowjava.protocol.api.extensibility.AlienMessageListener;
 import org.opendaylight.openflowjava.protocol.impl.core.OFVersionDetector;
 import org.opendaylight.openflowjava.protocol.impl.core.PipelineHandlers;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoRequestMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ErrorMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterMessage;
@@ -141,7 +142,8 @@ public class ConnectionAdapterImpl extends AbstractConnectionAdapterStatistics i
 
             if (alienMessageListener != null && alienMessageListener.onAlienMessage((OfHeader) message)) {
                 LOG.debug("Alien message {} received", message.getImplementedInterface());
-            } else if (outputManager == null || !outputManager.onMessage((OfHeader) message)) {
+            } else if (outputManager == null || !outputManager.onMessage((OfHeader) message) || message instanceof
+                    EchoOutput) {
                 final RpcResponseKey key = createRpcResponseKey((OfHeader) message);
                 final ResponseExpectedRpcListener<?> listener = findRpcResponse(key);
                 if (listener != null) {