Use frameset begin/end flags for determining frameset boundaries.

Set frameset & segment begin/end flags for content bearing methods (i.e. messages).



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

2 files changed, 11 insertions, 0 deletions

diff --git a/qpid/cpp/src/tests/MessageBuilderTest.cpp b/qpid/cpp/src/tests/MessageBuilderTest.cpp
index 341fdf56f5..98f5bd92a8 100644
--- a/qpid/cpp/src/tests/MessageBuilderTest.cpp
+++ b/qpid/cpp/src/tests/MessageBuilderTest.cpp
@@ -126,6 +126,10 @@ class MessageBuilderTest : public CppUnit::TestCase
         AMQFrame method(0, MessageTransferBody(ProtocolVersion(), 0, exchange, 0, 0));
         AMQFrame header(0, AMQHeaderBody());
         AMQFrame content(0, AMQContentBody(data));
+        method.setEof(false);
+        header.setBof(false);
+        header.setEof(false);
+        content.setBof(false);
 
         header.castBody<AMQHeaderBody>()->get<MessageProperties>(true)->setContentLength(data.size());        
         header.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true)->setRoutingKey(key);
@@ -156,6 +160,12 @@ class MessageBuilderTest : public CppUnit::TestCase
         AMQFrame header(0, AMQHeaderBody());
         AMQFrame content1(0, AMQContentBody(data1));
         AMQFrame content2(0, AMQContentBody(data2));
+        method.setEof(false);
+        header.setBof(false);
+        header.setEof(false);
+        content1.setBof(false);
+        content1.setEof(false);
+        content2.setBof(false);
 
         header.castBody<AMQHeaderBody>()->get<MessageProperties>(true)->setContentLength(data1.size() + data2.size());        
         header.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true)->setRoutingKey(key);
diff --git a/qpid/cpp/src/tests/topic_listener.cpp b/qpid/cpp/src/tests/topic_listener.cpp
index cddf3cb92a..38f5c76f54 100644
--- a/qpid/cpp/src/tests/topic_listener.cpp
+++ b/qpid/cpp/src/tests/topic_listener.cpp
@@ -114,6 +114,7 @@ int main(int argc, char** argv){
             channel.consume(control, "c1", &listener, AckMode(args.ackmode));
             cout << "topic_listener: Consuming." << endl;
             channel.run();
+            cout << "topic_listener: run returned, closing connection" << endl;
             connection.close();
             cout << "topic_listener: normal exit" << endl;
         }