* cpp/tests/BrokerChannelTest.cpp: Fix leak.

* cpp/lib/broker/Connection.h: signature fix, pass const& instead of *.
* cpp/lib/client/IncomingMessage.cpp: Correct error codes.
* cpp/lib/broker/Reference.cpp: Fix TODO.


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

4 files changed, 7 insertions, 6 deletions

diff --git a/qpid/cpp/lib/broker/Connection.cpp b/qpid/cpp/lib/broker/Connection.cpp
index ae0114cba9..dbc8149cb5 100644
--- a/qpid/cpp/lib/broker/Connection.cpp
+++ b/qpid/cpp/lib/broker/Connection.cpp
@@ -76,15 +76,15 @@ void Connection::close(
     getOutput().close();
 }
 
-void Connection::initiated(framing::ProtocolInitiation* header) {
-    version = ProtocolVersion(header->getMajor(), header->getMinor());
+void Connection::initiated(const framing::ProtocolInitiation& header) {
+    version = ProtocolVersion(header.getMajor(), header.getMinor());
     FieldTable properties;
     string mechanisms("PLAIN");
     string locales("en_US");
     getChannel(0).init(0, *out, getVersion());
     client = &getChannel(0).getAdatper().getProxy().getConnection();
     client->start(
-        header->getMajor(), header->getMinor(),
+        header.getMajor(), header.getMinor(),
         properties, mechanisms, locales);
 }
 
diff --git a/qpid/cpp/lib/broker/Connection.h b/qpid/cpp/lib/broker/Connection.h
index 1314ccbd97..5c6f40ca54 100644
--- a/qpid/cpp/lib/broker/Connection.h
+++ b/qpid/cpp/lib/broker/Connection.h
@@ -81,7 +81,7 @@ class Connection : public sys::ConnectionInputHandler,
 
     // ConnectionInputHandler methods
     void received(framing::AMQFrame* frame);
-    void initiated(framing::ProtocolInitiation* header);
+    void initiated(const framing::ProtocolInitiation& header);
     void idleOut();
     void idleIn();
     void closed();
diff --git a/qpid/cpp/lib/broker/Reference.cpp b/qpid/cpp/lib/broker/Reference.cpp
index c4c33e6363..bd1bdcb007 100644
--- a/qpid/cpp/lib/broker/Reference.cpp
+++ b/qpid/cpp/lib/broker/Reference.cpp
@@ -28,8 +28,6 @@ namespace broker {
 
 Reference::shared_ptr  ReferenceRegistry::open(const Reference::Id& id) {
     ReferenceMap::iterator i = references.find(id);
-    // TODO aconway 2007-02-05: should we throw Channel or Connection
-    // exceptions here?
     if (i != references.end())
         throw ConnectionException(503, "Attempt to re-open reference " +id);
     return references[id] = Reference::shared_ptr(new Reference(id, this));
diff --git a/qpid/cpp/lib/broker/Reference.h b/qpid/cpp/lib/broker/Reference.h
index e453645a54..277eb7b917 100644
--- a/qpid/cpp/lib/broker/Reference.h
+++ b/qpid/cpp/lib/broker/Reference.h
@@ -36,6 +36,9 @@ namespace broker {
 class MessageMessage;
 class ReferenceRegistry;
 
+// FIXME aconway 2007-03-27: Merge with client::IncomingMessage
+// to common reference handling code.
+
 /**
  * A reference is an accumulation point for data in a multi-frame
  * message. A reference can be used by multiple transfer commands to