Integration test, SimpleClient bundle

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

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/ConnectionAdapterImpl.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/ConnectionAdapterImpl.java
index 0658b7146d4bbb11a48f70a3134dc587256df0fa..f91123b84ebc0cab02fb180e347e4bc9b45c8c8e 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/ConnectionAdapterImpl.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/ConnectionAdapterImpl.java
@@ -233,7 +233,7 @@ public class ConnectionAdapterImpl implements ConnectionFacade {
     }
     
     @Override
-    public void consume(DataObject message) {
+    public void consume(final DataObject message) {
         LOG.debug("Consume msg");
         if (disconnectOccured ) {
             return;
@@ -274,11 +274,18 @@ public class ConnectionAdapterImpl implements ConnectionFacade {
             if (message instanceof OfHeader) {
                 LOG.debug("OFheader msg received");
                 RpcResponseKey key = createRpcResponseKey((OfHeader) message);
-                SettableFuture<RpcResult<?>> rpcFuture = findRpcResponse(key);
+                final SettableFuture<RpcResult<?>> rpcFuture = findRpcResponse(key);
                 if (rpcFuture != null) {
                     LOG.debug("corresponding rpcFuture found");
-                    List<RpcError> errors = Collections.emptyList();
-                    rpcFuture.set(Rpcs.getRpcResult(true, message, errors));
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            List<RpcError> errors = Collections.emptyList();
+                            LOG.debug("before setting rpcFuture");
+                            rpcFuture.set(Rpcs.getRpcResult(true, message, errors));
+                            LOG.debug("after setting rpcFuture");
+                        }
+                    }).start();
                     responseCache.invalidate(key);
                 } else {
                     LOG.warn("received unexpected rpc response: "+key);
@@ -446,7 +453,9 @@ public class ConnectionAdapterImpl implements ConnectionFacade {
                     io.netty.util.concurrent.Future<? super Void> future)
                     throws Exception {
                 transportResult.set(future.isSuccess());
-                transportResult.setException(future.cause());
+                if (!future.isSuccess()) {
+                    transportResult.setException(future.cause());
+                }
             }
         });
         return transportResult;