* 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@577072 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 7 insertions, 11 deletions

diff --git a/qpid/cpp/src/qpid/broker/SemanticHandler.cpp b/qpid/cpp/src/qpid/broker/SemanticHandler.cpp
index 2dd7861e4a..fc878ca346 100644
--- a/qpid/cpp/src/qpid/broker/SemanticHandler.cpp
+++ b/qpid/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()
 {
diff --git a/qpid/cpp/src/tests/stop_broker b/qpid/cpp/src/tests/stop_broker
index 4f183d18f5..e141ef9841 100755
--- a/qpid/cpp/src/tests/stop_broker
+++ b/qpid/cpp/src/tests/stop_broker
@@ -4,14 +4,11 @@
 export QPID_PORT=`cat qpidd.port`
 rm -f qpidd.port
 
-# Wait for daemon to quit
 ../qpidd --quit || ERROR=$?
-while ../qpidd --check >/dev/null 2>&1; do true; done
 
 # Check qpidd.log.
-egrep 'warning|error|critical' qpidd.log && {
-    echo "Suspicious broker log entries in qpidd.log, above."
-    ERROR=1
+grep -a 'warning\|error\|critical' qpidd.log && {
+    echo "WARNING: Suspicious broker log entries in qpidd.log, above."
 }
 
 # Check valgrind log.