summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/broker
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2007-09-18 21:30:18 +0000
committerAlan Conway <aconway@apache.org>2007-09-18 21:30:18 +0000
commitbe203866995fc2cc9a066fe8acc8caa87937fc7b (patch)
treeab0997dbe6a0b450823dc7eadf52f379436217fd /cpp/src/qpid/broker
parent6d8a7813e9b75b3dd870b1e815cb5b78ef6da8ee (diff)
downloadqpid-python-be203866995fc2cc9a066fe8acc8caa87937fc7b.tar.gz
* src/qpid/broker/SemanticHandler.cpp: add assert to suspect logic for execution.flush
* src/tests/stop_broker: Warn rather than error on qpidd.log messages. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@577072 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker')
-rw-r--r--cpp/src/qpid/broker/SemanticHandler.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/cpp/src/qpid/broker/SemanticHandler.cpp b/cpp/src/qpid/broker/SemanticHandler.cpp
index 2dd7861e4a..fc878ca346 100644
--- a/cpp/src/qpid/broker/SemanticHandler.cpp
+++ b/cpp/src/qpid/broker/SemanticHandler.cpp
@@ -93,12 +93,11 @@ void SemanticHandler::complete(uint32_t cumulative, const SequenceNumberSet& ran
void SemanticHandler::sendCompletion()
{
- if (getSessionHandler()) {
- SequenceNumber mark = incoming.getMark();
- SequenceNumberSet range = incoming.getRange();
- Mutex::ScopedLock l(outLock);
- getProxy().getExecution().complete(mark.getValue(), range);
- }
+ SequenceNumber mark = incoming.getMark();
+ SequenceNumberSet range = incoming.getRange();
+ Mutex::ScopedLock l(outLock);
+ assert(getSessionHandler());
+ getProxy().getExecution().complete(mark.getValue(), range);
}
void SemanticHandler::flush()
{