* cpp/lib/broker/Broker.cpp: Defer creation of acceptor till needed so

  InProcessBroker will not listen on any port.

* cpp/lib/broker/BrokerAdapter,Connection.cpp,.h: Encapsulate public data
  members.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@501638 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 8 deletions

diff --git a/cpp/lib/broker/Connection.cpp b/cpp/lib/broker/Connection.cpp
index 0f58278a5a..5fcae39865 100644
--- a/cpp/lib/broker/Connection.cpp
+++ b/cpp/lib/broker/Connection.cpp
@@ -32,11 +32,11 @@ namespace qpid {
 namespace broker {
 
 Connection::Connection(ConnectionOutputHandler* out_, Broker& broker_) :
-    framemax(65536), 
-    heartbeat(0),
     broker(broker_),
     settings(broker.getTimeout(), broker.getStagingThreshold()),
-    out(out_)
+    out(out_),
+    framemax(65536), 
+    heartbeat(0)
 {}
 
 Queue::shared_ptr Connection::getQueue(const string& name, u_int16_t channel){
@@ -106,11 +106,12 @@ void Connection::closeChannel(u_int16_t channel) {
 BrokerAdapter& Connection::getAdapter(u_int16_t id) { 
     AdapterMap::iterator i = adapters.find(id);
     if (i == adapters.end()) {
-        Channel* ch=new Channel(
-            client->getProtocolVersion(), out, id,
-            framemax, broker.getQueues().getStore(),
-            settings.stagingThreshold);
-        BrokerAdapter* adapter =  new BrokerAdapter(ch, *this, broker);
+        std::auto_ptr<Channel> ch(
+            new Channel(
+                client->getProtocolVersion(), out, id,
+                framemax, broker.getQueues().getStore(),
+                settings.stagingThreshold));
+        BrokerAdapter* adapter = new BrokerAdapter(ch, *this, broker);
         adapters.insert(id, adapter);
         return *adapter;
     }