diff options
| author | Ted Ross <tross@apache.org> | 2009-09-04 00:27:37 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2009-09-04 00:27:37 +0000 |
| commit | a24765fa81f103968460653a247925d63366f2e3 (patch) | |
| tree | 71ea9e259c205410f808c8cde2f52dec505b1fd5 /qpid/cpp | |
| parent | 7912b9966156ae49a8c00289d02c8b51544eaa0c (diff) | |
| download | qpid-python-a24765fa81f103968460653a247925d63366f2e3.tar.gz | |
QPID-2080 - crash when attempting to modify an exchange's alternate
Committed patch from Ken Giusti
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@811188 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/SessionAdapter.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/broker/SessionAdapter.cpp b/qpid/cpp/src/qpid/broker/SessionAdapter.cpp index b0c5e9ea00..af07605552 100644 --- a/qpid/cpp/src/qpid/broker/SessionAdapter.cpp +++ b/qpid/cpp/src/qpid/broker/SessionAdapter.cpp @@ -121,9 +121,11 @@ void SessionAdapter::ExchangeHandlerImpl::checkType(Exchange::shared_ptr exchang void SessionAdapter::ExchangeHandlerImpl::checkAlternate(Exchange::shared_ptr exchange, Exchange::shared_ptr alternate) { - if (alternate && alternate != exchange->getAlternate()) + if (alternate && ((exchange->getAlternate() && alternate != exchange->getAlternate()) + || !exchange->getAlternate())) throw NotAllowedException(QPID_MSG("Exchange declared with alternate-exchange " - << exchange->getAlternate()->getName() << ", requested " + << (exchange->getAlternate() ? exchange->getAlternate()->getName() : "<nonexistent>") + << ", requested " << alternate->getName())); } |