qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
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 GMT
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 <aconway@redhat.com> - 0.2-2
+- Bugfix for memory errors on x86_64.
 
 * Thu Apr 12 2007 Alan Conway <aconway@redhat.com> - 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<AMQResponseBody> 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	\



Mime
View raw message