Hid locking within exchange registry, switched to shared_ptr for exchanges, added some extra error handling and tests.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
index 60ee9cc4ad..b98f70ef68 100644
--- a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
+++ b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
@@ -33,11 +33,11 @@ const std::string amq_match("amq.match");
 }
 
 SessionHandlerFactoryImpl::SessionHandlerFactoryImpl(u_int32_t _timeout) : timeout(_timeout), cleaner(&queues, timeout/10){
-    exchanges.declare(new DirectExchange(empty)); // Default exchange.
-    exchanges.declare(new DirectExchange(amq_direct));
-    exchanges.declare(new TopicExchange(amq_topic));
-    exchanges.declare(new FanOutExchange(amq_fanout));
-    exchanges.declare(new HeadersExchange(amq_match));
+    exchanges.declare(empty, DirectExchange::typeName); // Default exchange.
+    exchanges.declare(amq_direct, DirectExchange::typeName);
+    exchanges.declare(amq_topic, TopicExchange::typeName);
+    exchanges.declare(amq_fanout, FanOutExchange::typeName);
+    exchanges.declare(amq_match, HeadersExchange::typeName);
     cleaner.start();
 }