2 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/qpid/broker/PreviewConnectionCodec.cpp b/cpp/src/qpid/broker/PreviewConnectionCodec.cpp
index d3a5281109..b6c9b03776 100644
--- a/cpp/src/qpid/broker/PreviewConnectionCodec.cpp
+++ b/cpp/src/qpid/broker/PreviewConnectionCodec.cpp
@@ -40,7 +40,7 @@ size_t  PreviewConnectionCodec::decode(const char* buffer, size_t size) {
 }
 
 bool PreviewConnectionCodec::canEncode() {
-    if (!frameQueueClosed) connection.doOutput();
+    if (!frameQueueClosed && frameQueue.empty()) connection.doOutput();
     return !frameQueue.empty();
 }
 
@@ -56,6 +56,7 @@ size_t  PreviewConnectionCodec::encode(const char* buffer, size_t size) {
             frameQueue.front().encode(out);
             QPID_LOG(trace, "SENT [" << identifier << "]: " << frameQueue.front());
             frameQueue.pop();
+            if (!frameQueueClosed && frameQueue.empty()) connection.doOutput();
     }
     if (!frameQueue.empty() && frameQueue.front().size() > size)
         throw framing::ContentTooLargeException(QPID_MSG("Could not write frame, too large for buffer."));
diff --git a/cpp/src/qpid/sys/AsynchIOAcceptor.cpp b/cpp/src/qpid/sys/AsynchIOAcceptor.cpp
index 6502885ed0..153557c5e5 100644
--- a/cpp/src/qpid/sys/AsynchIOAcceptor.cpp
+++ b/cpp/src/qpid/sys/AsynchIOAcceptor.cpp
@@ -301,7 +301,7 @@ void AsynchIOHandler::idle(AsynchIO&){
         return;
     }
     if (codec == 0) return;
-    while (codec->canEncode()) {
+    if (codec->canEncode()) {
         // Try and get a queued buffer if not then construct new one
         AsynchIO::BufferBase* buff = aio->getQueuedBuffer();
         if (!buff) buff = new Buff;