diff options
Diffstat (limited to 'cpp/src/qpid/amqp_0_10/Connection.cpp')
| -rw-r--r-- | cpp/src/qpid/amqp_0_10/Connection.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/qpid/amqp_0_10/Connection.cpp b/cpp/src/qpid/amqp_0_10/Connection.cpp index 9b8b7d93c7..5241abed9b 100644 --- a/cpp/src/qpid/amqp_0_10/Connection.cpp +++ b/cpp/src/qpid/amqp_0_10/Connection.cpp @@ -78,15 +78,15 @@ size_t Connection::encode(const char* buffer, size_t size) { QPID_LOG(trace, "SENT " << identifier << " INIT(" << pi << ")"); } size_t frameSize=0; - while (!frameQueue.empty() && ((frameSize=frameQueue.front().size()) <= out.available())) { + while (!frameQueue.empty() && ((frameSize=frameQueue.front().encodedSize()) <= out.available())) { frameQueue.front().encode(out); QPID_LOG(trace, "SENT [" << identifier << "]: " << frameQueue.front()); frameQueue.pop_front(); buffered -= frameSize; if (frameQueue.empty() && out.available() > 0) connection->doOutput(); } - assert(frameQueue.empty() || frameQueue.front().size() <= size); - if (!frameQueue.empty() && frameQueue.front().size() > size) + assert(frameQueue.empty() || frameQueue.front().encodedSize() <= size); + if (!frameQueue.empty() && frameQueue.front().encodedSize() > size) throw InternalErrorException(QPID_MSG("Could not write frame, too large for buffer.")); return out.getPosition(); } @@ -108,7 +108,7 @@ void Connection::send(framing::AMQFrame& f) { Mutex::ScopedLock l(frameQueueLock); if (!frameQueueClosed) frameQueue.push_back(f); - buffered += f.size(); + buffered += f.encodedSize(); } activateOutput(); } |