Author: shuston Date: Sat Nov 13 13:10:42 2010 New Revision: 1034751 URL: http://svn.apache.org/viewvc?rev=1034751&view=rev Log: Merged fix for QPID-2941 from trunk.
Modified: qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp (contents, props changed) Modified: qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp URL: http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp?rev=1034751&r1=1034750&r2=1034751&view=diff ============================================================================== --- qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp (original) +++ qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp Sat Nov 13 13:10:42 2010 @@ -359,10 +359,13 @@ Messages::recover(qpid::broker::Recovery std::list<MessageInfo::Location>::iterator w = m->where.begin(); while (w != m->where.end()) { if (w->queueId == loc.queueId) { - if (loc.transaction.get() != 0) + if (loc.transaction.get() != 0) { *w = loc; - else - m->where.erase(w); + ++w; + } + else { + w = m->where.erase(w); + } } } } @@ -381,6 +384,7 @@ Messages::recover(qpid::broker::Recovery messages.insert(p); } } + QPID_LOG(debug, "Message log recovery done."); // Done! Ok, go back and delete all the homeless messages. BOOST_FOREACH(uint64_t msg, homeless) { Propchange: qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Nov 13 13:10:42 2010 @@ -0,0 +1,5 @@ +/qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp:892761,894875 +/qpid/branches/0.6-release-windows-installer/cpp/src/qpid/store/ms-clfs/Messages.cpp:926803 +/qpid/branches/0.6-release-windows-installer/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp:926803,927233 +/qpid/branches/java-network-refactor/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp:805429-825319 +/qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp:1034586 --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org