Catch exception now thrown by ExchangeRegistry::getDefault() when a default has not been set.

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

1 files changed, 7 insertions, 3 deletions

diff --git a/cpp/lib/broker/RecoveryManager.cpp b/cpp/lib/broker/RecoveryManager.cpp
index 6ea4c00c65..6548e6a24f 100644
--- a/cpp/lib/broker/RecoveryManager.cpp
+++ b/cpp/lib/broker/RecoveryManager.cpp
@@ -29,9 +29,13 @@ RecoveryManager::~RecoveryManager() {}
 Queue::shared_ptr RecoveryManager::recoverQueue(const string& name)
 {
     std::pair<Queue::shared_ptr, bool> result = queues.declare(name, true);
-    Exchange::shared_ptr exchange = exchanges.getDefault();
-    if (exchange) {
-        exchange->bind(result.first, result.first->getName(), 0);
+    try {
+        Exchange::shared_ptr exchange = exchanges.getDefault();
+        if (exchange) {
+            exchange->bind(result.first, result.first->getName(), 0);
+        }
+    } catch (ChannelException& e) {
+        //assume no default exchange has been declared
     }
     return result.first;
 }