QPID-2631: For blocking Bounds::expand() calls, only increase the current count when there is space. In SessionImpl::send() expand bounds before queueing frame. Expand bounds for all frames sent (including connection frames and cluster specific frames).

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@948936 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 0 deletions

diff --git a/cpp/src/tests/cluster_test.cpp b/cpp/src/tests/cluster_test.cpp
index 8c18e578df..d5f2c457e5 100644
--- a/cpp/src/tests/cluster_test.cpp
+++ b/cpp/src/tests/cluster_test.cpp
@@ -124,6 +124,7 @@ class Sender {
         f.setLastSegment(lastSeg);
         f.setFirstFrame(firstFrame);
         f.setLastFrame(lastFrame);
+        connection->expand(f.encodedSize(), false);
         connection->handle(f);
     }
 
@@ -209,6 +210,7 @@ QPID_AUTO_TEST_CASE(testBadClientData) {
     boost::shared_ptr<client::ConnectionImpl> ci =
         client::ConnectionAccess::getImpl(c0.connection);
     AMQFrame poison(boost::intrusive_ptr<AMQBody>(new PoisonPill));
+    ci->expand(poison.encodedSize(), false);
     ci->handle(poison);
     {
         ScopedSuppressLogging sl;