1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/qpid/client/TCPConnector.cpp b/cpp/src/qpid/client/TCPConnector.cpp
index 2bdeec5b47..02f820fe03 100644
--- a/cpp/src/qpid/client/TCPConnector.cpp
+++ b/cpp/src/qpid/client/TCPConnector.cpp
@@ -289,8 +289,10 @@ size_t TCPConnector::decode(const char* buffer, size_t size)
                 throw Exception(QPID_MSG("Unsupported version: " << protocolInit
                                          << " supported version " << version));
             }
+            initiated = true;
+        } else {
+            return size - in.available();
         }
-        initiated = true;
     }
     AMQFrame frame;
     while(frame.decode(in)){