Return-Path: Delivered-To: apmail-incubator-qpid-commits-archive@locus.apache.org Received: (qmail 29309 invoked from network); 18 Sep 2007 21:30:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Sep 2007 21:30:42 -0000 Received: (qmail 56696 invoked by uid 500); 18 Sep 2007 21:30:35 -0000 Delivered-To: apmail-incubator-qpid-commits-archive@incubator.apache.org Received: (qmail 56656 invoked by uid 500); 18 Sep 2007 21:30:34 -0000 Mailing-List: contact qpid-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: qpid-dev@incubator.apache.org Delivered-To: mailing list qpid-commits@incubator.apache.org Received: (qmail 56647 invoked by uid 99); 18 Sep 2007 21:30:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Sep 2007 14:30:34 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Sep 2007 21:32:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1CD561A9832; Tue, 18 Sep 2007 14:30:20 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r577072 - in /incubator/qpid/trunk/qpid/cpp/src: qpid/broker/SemanticHandler.cpp tests/stop_broker Date: Tue, 18 Sep 2007 21:30:19 -0000 To: qpid-commits@incubator.apache.org From: aconway@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070918213020.1CD561A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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.