Author: tross
Date: Fri Sep 4 00:27:37 2009
New Revision: 811188
URL: http://svn.apache.org/viewvc?rev=811188&view=rev
Log:
QPID-2080 - crash when attempting to modify an exchange's alternate
Committed patch from Ken Giusti
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
qpid/trunk/qpid/python/tests_0-10/alternate_exchange.py
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp?rev=811188&r1=811187&r2=811188&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp Fri Sep 4 00:27:37
2009
@@ -121,9 +121,11 @@
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()));
}
Modified: qpid/trunk/qpid/python/tests_0-10/alternate_exchange.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/tests_0-10/alternate_exchange.py?rev=811188&r1=811187&r2=811188&view=diff
==============================================================================
--- qpid/trunk/qpid/python/tests_0-10/alternate_exchange.py (original)
+++ qpid/trunk/qpid/python/tests_0-10/alternate_exchange.py Fri Sep 4 00:27:37
2009
@@ -141,7 +141,61 @@
session.exchange_delete(exchange="e")
session.exchange_delete(exchange="alternate")
self.assertEquals(530, e.args[0].error_code)
-
+
+
+ def test_modify_existing_exchange_alternate(self):
+ """
+ Ensure that attempting to modify an exhange to change
+ the alternate throws an exception
+ """
+ session = self.session
+ session.exchange_declare(exchange="alt1", type="direct")
+ session.exchange_declare(exchange="alt2", type="direct")
+ session.exchange_declare(exchange="onealternate", type="fanout",
alternate_exchange="alt1")
+ try:
+ # attempt to change the alternate on an already existing exchange
+ session.exchange_declare(exchange="onealternate", type="fanout",
alternate_exchange="alt2")
+ self.fail("Expected changing an alternate on an existing exchange
to fail")
+ except SessionException, e:
+ self.assertEquals(530, e.args[0].error_code)
+ session = self.conn.session("alternate", 2)
+ session.exchange_delete(exchange="onealternate")
+ session.exchange_delete(exchange="alt2")
+ session.exchange_delete(exchange="alt1")
+
+
+ def test_add_alternate_to_exchange(self):
+ """
+ Ensure that attempting to modify an exhange by adding
+ an alternate throws an exception
+ """
+ session = self.session
+ session.exchange_declare(exchange="alt1", type="direct")
+ session.exchange_declare(exchange="noalternate", type="fanout")
+ try:
+ # attempt to add an alternate on an already existing exchange
+ session.exchange_declare(exchange="noalternate", type="fanout",
alternate_exchange="alt1")
+ self.fail("Expected adding an alternate on an existing exchange to
fail")
+ except SessionException, e:
+ self.assertEquals(530, e.args[0].error_code)
+ session = self.conn.session("alternate", 2)
+ session.exchange_delete(exchange="noalternate")
+ session.exchange_delete(exchange="alt1")
+
+
+ def test_del_alternate_to_exchange(self):
+ """
+ Ensure that attempting to modify an exhange by declaring
+ it again without an alternate does nothing
+ """
+ session = self.session
+ session.exchange_declare(exchange="alt1", type="direct")
+ session.exchange_declare(exchange="onealternate", type="fanout",
alternate_exchange="alt1")
+ # attempt to re-declare without an alternate - silently ignore
+ session.exchange_declare(exchange="onealternate", type="fanout" )
+ session.exchange_delete(exchange="onealternate")
+ session.exchange_delete(exchange="alt1")
+
def assertEmpty(self, queue):
try:
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
