summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/broker/Exchange.cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-01-18 22:08:38 +0000
committerAlan Conway <aconway@apache.org>2012-01-18 22:08:38 +0000
commit758cea0b9d79b3359efe12592d4bfba08eeed2ac (patch)
tree9aac7137c7672b9edb1a4dd50706865a8518d3f8 /cpp/src/qpid/broker/Exchange.cpp
parent893a3834c13c7ee7fa2c6b4aadb8585bb13e1fa7 (diff)
downloadqpid-python-758cea0b9d79b3359efe12592d4bfba08eeed2ac.tar.gz
QPID-3603: Fix spurious "exchange not found" error and debug messages.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1233085 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Exchange.cpp')
-rw-r--r--cpp/src/qpid/broker/Exchange.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/cpp/src/qpid/broker/Exchange.cpp b/cpp/src/qpid/broker/Exchange.cpp
index d68845062d..5d763bf0da 100644
--- a/cpp/src/qpid/broker/Exchange.cpp
+++ b/cpp/src/qpid/broker/Exchange.cpp
@@ -279,12 +279,10 @@ uint32_t Exchange::encodedSize() const
void Exchange::recoveryComplete(ExchangeRegistry& exchanges)
{
if (!alternateName.empty()) {
- try {
- Exchange::shared_ptr ae = exchanges.get(alternateName);
- setAlternate(ae);
- } catch (const NotFoundException&) {
- QPID_LOG(warning, "Could not set alternate exchange \"" << alternateName << "\": does not exist.");
- }
+ Exchange::shared_ptr ae = exchanges.find(alternateName);
+ if (ae) setAlternate(ae);
+ else QPID_LOG(warning, "Could not set alternate exchange \""
+ << alternateName << "\": does not exist.");
}
}