qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject svn commit: r1538629 - /qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
Date Mon, 04 Nov 2013 14:38:59 GMT
Author: gsim
Date: Mon Nov  4 14:38:59 2013
New Revision: 1538629

URL: http://svn.apache.org/r1538629
Log:
QPID-5288: add checking for connection/session close before waiting on Sender::close()

Modified:
    qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp?rev=1538629&r1=1538628&r2=1538629&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp Mon Nov  4 14:38:59
2013
@@ -249,7 +249,7 @@ void ConnectionContext::detach(boost::sh
     }
     wakeupDriver();
     while (pn_link_state(lnk->sender) & PN_REMOTE_ACTIVE) {
-        wait();
+        wait(ssn);
     }
     ssn->removeSender(lnk->getName());
 }
@@ -262,7 +262,7 @@ void ConnectionContext::detach(boost::sh
     }
     wakeupDriver();
     while (pn_link_state(lnk->receiver) & PN_REMOTE_ACTIVE) {
-        wait();
+        wait(ssn);
     }
     ssn->removeReceiver(lnk->getName());
 }
@@ -419,6 +419,7 @@ void ConnectionContext::check()
 
 void ConnectionContext::wait()
 {
+    check();
     lock.wait();
     check();
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message