qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kp...@apache.org
Subject svn commit: r1574513 - /qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp
Date Wed, 05 Mar 2014 14:51:06 GMT
Author: kpvdr
Date: Wed Mar  5 14:51:06 2014
New Revision: 1574513

URL: http://svn.apache.org/r1574513
Log:
QPID-5603: Broker recovery fails with JERR_JREC_BADRECTAIL when record tail is partly or fully
separated from rest of record by file boundary

Modified:
    qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp?rev=1574513&r1=1574512&r2=1574513&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp Wed Mar  5 14:51:06
2014
@@ -239,7 +239,7 @@ bool RecoveryManager::readNextRemainingR
         checksum.addData((const unsigned char*)*dataPtrPtr, dataSize);
     }
     ::rec_tail_t enqueueTail;
-    inFileStream_.read((char*)&enqueueTail, sizeof(::rec_tail_t));
+    readJournalData((char*)&enqueueTail, sizeof(::rec_tail_t));
     uint32_t cs = checksum.getChecksum();
     uint16_t res = ::rec_tail_check(&enqueueTail, &enqueueHeader._rhdr, cs);
     if (res != 0) {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message