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 2006/10/12 12:04:55 UTC

svn commit: r463179 - in /incubator/qpid/trunk/qpid/cpp/broker: src/Channel.cpp test/ChannelTest.cpp

Author: gsim
Date: Thu Oct 12 03:04:53 2006
New Revision: 463179

URL: http://svn.apache.org/viewvc?view=rev&rev=463179
Log:
Fixed bug causing ChannelTest.testDeliveryNoAck to fail intermittently.


Modified:
    incubator/qpid/trunk/qpid/cpp/broker/src/Channel.cpp
    incubator/qpid/trunk/qpid/cpp/broker/test/ChannelTest.cpp

Modified: incubator/qpid/trunk/qpid/cpp/broker/src/Channel.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/broker/src/Channel.cpp?view=diff&rev=463179&r1=463178&r2=463179
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/Channel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/broker/src/Channel.cpp Thu Oct 12 03:04:53 2006
@@ -124,7 +124,7 @@
 }
 
 bool Channel::ConsumerImpl::deliver(Message::shared_ptr& msg){
-    if(connection != msg->getPublisher()){//check for no_local
+    if(!connection || connection != msg->getPublisher()){//check for no_local
         if(ackExpected && !parent->checkPrefetch(msg)){
             blocked = true;
         }else{

Modified: incubator/qpid/trunk/qpid/cpp/broker/test/ChannelTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/broker/test/ChannelTest.cpp?view=diff&rev=463179&r1=463178&r2=463179
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/test/ChannelTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/broker/test/ChannelTest.cpp Thu Oct 12 03:04:53 2006
@@ -108,7 +108,7 @@
         msg->addContent(body);
 
         Queue::shared_ptr queue(new Queue("my_queue"));
-        ConnectionToken* owner;
+        ConnectionToken* owner(0);
         string tag("no_ack");
         channel.consume(tag, queue, false, false, owner);