Return-Path: Delivered-To: apmail-incubator-qpid-commits-archive@locus.apache.org Received: (qmail 72463 invoked from network); 16 Apr 2007 20:51:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Apr 2007 20:51:09 -0000 Received: (qmail 12363 invoked by uid 500); 16 Apr 2007 20:51:15 -0000 Delivered-To: apmail-incubator-qpid-commits-archive@incubator.apache.org Received: (qmail 12345 invoked by uid 500); 16 Apr 2007 20:51:15 -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 12332 invoked by uid 99); 16 Apr 2007 20:51:15 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Apr 2007 13:51:15 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Mon, 16 Apr 2007 13:51:07 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 85BA71A9838; Mon, 16 Apr 2007 13:50:46 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r529397 - in /incubator/qpid/trunk/qpid/cpp: qpidc.spec.in src/qpid/framing/Correlator.cpp src/tests/Makefile.am Date: Mon, 16 Apr 2007 20:50:46 -0000 To: qpid-commits@incubator.apache.org From: aconway@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070416205046.85BA71A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aconway Date: Mon Apr 16 13:50:45 2007 New Revision: 529397 URL: http://svn.apache.org/viewvc?view=rev&rev=529397 Log: * qpidc.spec.in: bump RPM revision for bugfix. * src/qpid/framing/Correlator.cpp: Fix memory bug in correlator. * src/tests/Makefile.am: Re-enable ClientChannelTest, bug fixed. Modified: incubator/qpid/trunk/qpid/cpp/qpidc.spec.in incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Correlator.cpp incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Modified: incubator/qpid/trunk/qpid/cpp/qpidc.spec.in URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/qpidc.spec.in?view=diff&rev=529397&r1=529396&r2=529397 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/qpidc.spec.in (original) +++ incubator/qpid/trunk/qpid/cpp/qpidc.spec.in Mon Apr 16 13:50:45 2007 @@ -5,7 +5,7 @@ Name: @PACKAGE@ Version: @VERSION@ -Release: 1%{?dist} +Release: 2%{?dist} Summary: Libraries for Qpid C++ client applications Group: System Environment/Libraries License: Apache Software License @@ -144,6 +144,9 @@ /sbin/ldconfig %changelog + +* Mon Apr 16 2007 Alan Conway - 0.2-2 +- Bugfix for memory errors on x86_64. * Thu Apr 12 2007 Alan Conway - 0.2-1 - Bumped version number for rhm dependencies. Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Correlator.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Correlator.cpp?view=diff&rev=529397&r1=529396&r2=529397 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Correlator.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Correlator.cpp Mon Apr 16 13:50:45 2007 @@ -27,16 +27,17 @@ bool Correlator::response(shared_ptr r) { Actions::iterator begin = actions.lower_bound(r->getRequestId()); - Actions::iterator end = - actions.upper_bound(r->getRequestId()+r->getBatchOffset()); + RequestId last = r->getRequestId()+r->getBatchOffset(); + Actions::iterator i = begin; bool didAction = false; - for(Actions::iterator i=begin; i != end; ++i) { - // FIXME aconway 2007-04-04: Exception handling. + for( ; i != actions.end() && i->first <= last; ++i) { didAction = true; + // FIXME aconway 2007-04-04: handle exceptions thrown by action. i->second(r); - actions.erase(i); } + actions.erase(begin, i); return didAction; } + }} // namespace qpid::framing Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?view=diff&rev=529397&r1=529396&r2=529397 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original) +++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Mon Apr 16 13:50:45 2007 @@ -24,7 +24,7 @@ MessageHandlerTest #client_unit_tests = \ -# ClientChannelTest + ClientChannelTest framing_unit_tests = \ FieldTableTest \