You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2009/11/19 23:07:43 UTC

svn commit: r882322 - in /qpid/trunk/qpid: cpp/src/qpid/broker/SessionAdapter.cpp python/tests_0-10/query.py

Author: gsim
Date: Thu Nov 19 22:07:43 2009
New Revision: 882322

URL: http://svn.apache.org/viewvc?rev=882322&view=rev
Log:
In exchange-bound, set queue-not-found correctly even if exchange is not found.

Modified:
    qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
    qpid/trunk/qpid/python/tests_0-10/query.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=882322&r1=882321&r2=882322&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp Thu Nov 19 22:07:43 2009
@@ -256,7 +256,7 @@
     }
 
     if (!exchange) {
-        return ExchangeBoundResult(true, false, false, false, false);
+        return ExchangeBoundResult(true, (!queueName.empty() && !queue), false, false, false);
     } else if (!queueName.empty() && !queue) {
         return ExchangeBoundResult(false, true, false, false, false);
     } else if (exchange->isBound(queue, key.empty() ? 0 : &key, args.count() > 0 ? &args : &args)) {

Modified: qpid/trunk/qpid/python/tests_0-10/query.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/tests_0-10/query.py?rev=882322&r1=882321&r2=882322&view=diff
==============================================================================
--- qpid/trunk/qpid/python/tests_0-10/query.py (original)
+++ qpid/trunk/qpid/python/tests_0-10/query.py Thu Nov 19 22:07:43 2009
@@ -133,8 +133,20 @@
         #test exchange not found
         self.assertEqual(True, session.exchange_bound(exchange="unknown-exchange").exchange_not_found)
 
-        #test queue not found
-        self.assertEqual(True, session.exchange_bound(exchange=exchange_name, queue="unknown-queue").queue_not_found)
+        #test exchange found, queue not found
+        response = session.exchange_bound(exchange=exchange_name, queue="unknown-queue")
+        self.assertEqual(False, response.exchange_not_found)
+        self.assertEqual(True, response.queue_not_found)
+
+        #test exchange not found, queue found
+        response = session.exchange_bound(exchange="unknown-exchange", queue="used-queue")
+        self.assertEqual(True, response.exchange_not_found)
+        self.assertEqual(False, response.queue_not_found)
+
+        #test not exchange found, queue not found
+        response = session.exchange_bound(exchange="unknown-exchange", queue="unknown-queue")
+        self.assertEqual(True, response.exchange_not_found)
+        self.assertEqual(True, response.queue_not_found)
 
 
     def test_exchange_bound_fanout(self):



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org