svn commit: r577072 - in /incubator/qpid/trunk/qpid/cpp/src: qpid/broker/SemanticHandler.cpp tests/stop_broker

[ac...@apache.org]

Author: aconway
Date: Tue Sep 18 14:30:18 2007
New Revision: 577072

URL: http://svn.apache.org/viewvc?rev=577072&view=rev
Log:
	* 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.

Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticHandler.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticHandler.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticHandler.cpp?rev=577072&r1=577071&r2=577072&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticHandler.cpp Tue Sep 18 14:30:18 2007
@@ -93,12 +93,11 @@
 
 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()
 {

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker?rev=577072&r1=577071&r2=577072&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker Tue Sep 18 14:30:18 2007
@@ -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.