From 5d8a9df4ec3a4f030ed80e143ce6986c19ab800a Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Fri, 7 Mar 2008 13:20:02 +0000 Subject: Altered management of delivery records to support separateion of completion (which drives flow control) and acceptance. Converted flow control python tests. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@634661 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/MultiVersionConnectionInputHandler.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'cpp/src/qpid/broker/MultiVersionConnectionInputHandler.cpp') diff --git a/cpp/src/qpid/broker/MultiVersionConnectionInputHandler.cpp b/cpp/src/qpid/broker/MultiVersionConnectionInputHandler.cpp index 676f9e4b3d..6c3d960d1f 100644 --- a/cpp/src/qpid/broker/MultiVersionConnectionInputHandler.cpp +++ b/cpp/src/qpid/broker/MultiVersionConnectionInputHandler.cpp @@ -64,7 +64,7 @@ void MultiVersionConnectionInputHandler::idleIn() bool MultiVersionConnectionInputHandler::doOutput() { - return check(false) && handler->doOutput(); + return handler.get() && handler->doOutput(); } qpid::framing::ProtocolInitiation MultiVersionConnectionInputHandler::getInitiation() @@ -74,17 +74,14 @@ qpid::framing::ProtocolInitiation MultiVersionConnectionInputHandler::getInitiat void MultiVersionConnectionInputHandler::closed() { - check(); - handler->closed(); + if (handler.get()) handler->closed(); + //else closed before initiated, nothing to do } -bool MultiVersionConnectionInputHandler::check(bool fail) +void MultiVersionConnectionInputHandler::check() { if (!handler.get()) { - if (fail) throw qpid::framing::InternalErrorException("Handler not initialised!"); - else return false; - } else { - return true; + throw qpid::framing::InternalErrorException("Handler not initialised!"); } } -- cgit v1.2.1