Author: gsim
Date: Mon Apr 14 14:11:25 2008
New Revision: 647999
URL: http://svn.apache.org/viewvc?rev=647999&view=rev
Log:
* Fix interpretation of accept-mode, 0 == EXPLICIT
* Ensure accepts are taken into account in command sequence
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageAdapter.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
incubator/qpid/trunk/qpid/python/qpid/session.py
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageAdapter.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageAdapter.cpp?rev=647999&r1=647998&r2=647999&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageAdapter.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageAdapter.cpp Mon Apr 14
14:11:25 2008
@@ -60,7 +60,7 @@
bool TransferAdapter::requiresAccept(const framing::FrameSet& f)
{
const framing::Message010TransferBody* b =
f.as<framing::Message010TransferBody>();
- return b && b->getAcceptMode();
+ return b && b->getAcceptMode() == 0/*EXPLICIT == 0*/;
}
std::string PreviewAdapter::getExchange(const framing::FrameSet& f)
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp?rev=647999&r1=647998&r2=647999&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp Mon Apr 14
14:11:25 2008
@@ -230,6 +230,7 @@
{
completed.add(msg->getCommandId());
if (msg->requiresAccept()) {
+ nextOut++;//accept is a command, so the counter must be incremented
getProxy().getMessage010().accept(SequenceSet(msg->getCommandId()));
}
}
Modified: incubator/qpid/trunk/qpid/python/qpid/session.py
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/qpid/session.py?rev=647999&r1=647998&r2=647999&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/python/qpid/session.py (original)
+++ incubator/qpid/trunk/qpid/python/qpid/session.py Mon Apr 14 14:11:25 2008
@@ -281,6 +281,9 @@
def __init__(self, session):
self.session = session
+ #XXX: do something with incoming accepts
+ def message_accept(self, ma): None
+
def execution_result(self, er):
future = self.session.results.pop(er.command_id)
future.set(er.value)
