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 2013/11/12 12:04:49 UTC
svn commit: r1541001 - in /qpid/trunk/qpid/cpp/src/qpid/messaging/amqp:
SenderContext.cpp SenderContext.h SessionContext.cpp
Author: gsim
Date: Tue Nov 12 11:04:48 2013
New Revision: 1541001
URL: http://svn.apache.org/r1541001
Log:
QPID-5331: don't wait for settlement on closing session if link has already been closed
Modified:
qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SenderContext.cpp
qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h
qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SenderContext.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SenderContext.cpp?rev=1541001&r1=1541000&r2=1541001&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SenderContext.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SenderContext.cpp Tue Nov 12 11:04:48 2013
@@ -575,6 +575,11 @@ bool SenderContext::settled()
return processUnsettled(false) == 0;
}
+bool SenderContext::closed()
+{
+ return pn_link_state(sender) & PN_LOCAL_CLOSED;
+}
+
Address SenderContext::getAddress() const
{
return address;
Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h?rev=1541001&r1=1541000&r2=1541001&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h Tue Nov 12 11:04:48 2013
@@ -80,6 +80,7 @@ class SenderContext
void verify();
void check();
bool settled();
+ bool closed();
Address getAddress() const;
private:
friend class ConnectionContext;
Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp?rev=1541001&r1=1541000&r2=1541001&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp Tue Nov 12 11:04:48 2013
@@ -162,7 +162,7 @@ bool SessionContext::settled()
bool result = true;
for (SenderMap::iterator i = senders.begin(); i != senders.end(); ++i) {
try {
- if (!i->second->settled()) result = false;
+ if (!i->second->closed() && !i->second->settled()) result = false;
} catch (const std::exception&) {
senders.erase(i);
throw;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org