3 files changed, 8 insertions, 8 deletions

diff --git a/cpp/src/qpid/client/Connector.cpp b/cpp/src/qpid/client/Connector.cpp
index 6449088f92..fe7793c432 100644
--- a/cpp/src/qpid/client/Connector.cpp
+++ b/cpp/src/qpid/client/Connector.cpp
@@ -318,7 +318,7 @@ void TCPConnector::Writer::write(sys::AsynchIO&) {
     size_t bytesWritten(0);
     for (size_t i = 0; i < lastEof; ++i) {
         AMQFrame& frame = frames[i];
-        uint32_t size = frame.size();
+        uint32_t size = frame.encodedSize();
         if (size > encode.available()) writeOne();
         assert(size <= encode.available());
         frame.encode(encode);
@@ -368,7 +368,7 @@ void TCPConnector::writeDataBlock(const AMQDataBlock& data) {
     AsynchIO::BufferBase* buff = new Buff(maxFrameSize);
     framing::Buffer out(buff->bytes, buff->byteCount);
     data.encode(out);
-    buff->dataCount = data.size();
+    buff->dataCount = data.encodedSize();
     aio->queueWrite(buff);
 }
 
diff --git a/cpp/src/qpid/client/RdmaConnector.cpp b/cpp/src/qpid/client/RdmaConnector.cpp
index 1a85cbb4bc..98fe762f31 100644
--- a/cpp/src/qpid/client/RdmaConnector.cpp
+++ b/cpp/src/qpid/client/RdmaConnector.cpp
@@ -349,7 +349,7 @@ void RdmaConnector::Writer::write(Rdma::AsynchIO&) {
     size_t bytesWritten = 0;
     while (aio->writable() && aio->bufferAvailable() && !frames.empty()) {
         const AMQFrame* frame = &frames.front();        
-        uint32_t size = frame->size();
+        uint32_t size = frame->encodedSize();
         while (size <= encode.available()) {
             frame->encode(encode);
             frames.pop_front();
@@ -358,7 +358,7 @@ void RdmaConnector::Writer::write(Rdma::AsynchIO&) {
             if (frames.empty())
                 break;
             frame = &frames.front();        
-            size = frame->size();
+            size = frame->encodedSize();
         }
         lastEof -= framesEncoded;
         writeOne();
@@ -392,7 +392,7 @@ void RdmaConnector::writeDataBlock(const AMQDataBlock& data) {
     Rdma::Buffer* buff = aio->getBuffer();
     framing::Buffer out(buff->bytes, buff->byteCount);
     data.encode(out);
-    buff->dataCount = data.size();
+    buff->dataCount = data.encodedSize();
     aio->queueWrite(buff);
 }
 
diff --git a/cpp/src/qpid/client/SessionImpl.cpp b/cpp/src/qpid/client/SessionImpl.cpp
index 3d73d92bd4..3e1ea8b724 100644
--- a/cpp/src/qpid/client/SessionImpl.cpp
+++ b/cpp/src/qpid/client/SessionImpl.cpp
@@ -427,13 +427,13 @@ void SessionImpl::handleIn(AMQFrame& frame) // network thread
 
 void SessionImpl::handleOut(AMQFrame& frame) // user thread
 {
-    connection->expand(frame.size(), true);
+    connection->expand(frame.encodedSize(), true);
     channel.handle(frame);
 }
 
 void SessionImpl::proxyOut(AMQFrame& frame) // network thread
 {
-    connection->expand(frame.size(), false);
+    connection->expand(frame.encodedSize(), false);
     channel.handle(frame);
 }
 
@@ -523,7 +523,7 @@ void SessionImpl::commandPoint(const framing::SequenceNumber& id, uint64_t offse
 
 void SessionImpl::expected(const framing::SequenceSet& commands, const framing::Array& fragments)
 {
-    if (!commands.empty() || fragments.size()) {
+    if (!commands.empty() || fragments.encodedSize()) {
         throw NotImplementedException("Session resumption not yet supported");
     }
 }