Replicate connection decoder fragments to new members.

Refactoring:
 - Merge Decoder into ConnectionMap.
 - Process cluster controls in event queue thread.
 - Use counter not pointer for connection ID, avoid re-use.
 - Do all processing in event queue thread to avoid races
   (temporary pending performance measurements)


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

2 files changed, 2 insertions, 2 deletions

diff --git a/cpp/src/tests/ClusterFixture.cpp b/cpp/src/tests/ClusterFixture.cpp
index 3a0ea74098..5658957b48 100644
--- a/cpp/src/tests/ClusterFixture.cpp
+++ b/cpp/src/tests/ClusterFixture.cpp
@@ -109,7 +109,7 @@ void ClusterFixture::addLocal() {
     Args args(makeArgs(prefix));
     vector<const char*> argv(args.size());
     transform(args.begin(), args.end(), argv.begin(), boost::bind(&string::c_str, _1));
-    qpid::log::Logger::instance().setPrefix(os.str());
+    qpid::log::Logger::instance().setPrefix(prefix);
     localBroker.reset(new BrokerFixture(parseOpts(argv.size(), &argv[0])));
     push_back(localBroker->getPort());
     forkedBrokers.push_back(shared_ptr<ForkedBroker>());
diff --git a/cpp/src/tests/FrameDecoder.cpp b/cpp/src/tests/FrameDecoder.cpp
index b7f1ea1b89..f5db66d5fe 100644
--- a/cpp/src/tests/FrameDecoder.cpp
+++ b/cpp/src/tests/FrameDecoder.cpp
@@ -65,7 +65,7 @@ QPID_AUTO_TEST_CASE(testByteFragments) {
     }
     Buffer buf(&encoded[encoded.size()-1], 1);
     BOOST_CHECK(decoder.decode(buf));
-    BOOST_CHECK_EQUAL(data, getData(decoder.frame));
+    BOOST_CHECK_EQUAL(data, getData(decoder.getFrame()));
 }