diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2014-01-12 22:41:32 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2014-01-12 22:41:32 +0000 |
| commit | 5f140a0486fdbb3a44f1400cb8fe021abc10f6ee (patch) | |
| tree | 8d0d0819c9bdd801ba675af37cd9ebca0d65feec /cpp/src/qpid/linearstore/journal/RecoveryManager.cpp | |
| parent | 7d1c5d0396e97283bc28393f7d2d67e4c28031c8 (diff) | |
| download | qpid-python-5f140a0486fdbb3a44f1400cb8fe021abc10f6ee.tar.gz | |
QPID-5473: Recovery where last record in file is truncated (ie spans files), but following file is uninitialized causes crash
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1557620 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/linearstore/journal/RecoveryManager.cpp')
| -rw-r--r-- | cpp/src/qpid/linearstore/journal/RecoveryManager.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp b/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp index 67ad8a04a0..e27a239a18 100644 --- a/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp +++ b/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp @@ -456,7 +456,7 @@ void RecoveryManager::checkJournalAlignment(const std::streampos recordPosition) bool RecoveryManager::decodeRecord(jrec& record, std::size_t& cumulativeSizeRead, ::rec_hdr_t& headerRecord, - std::streampos& fileOffset) + std::streampos& fileOffset) { std::streampos start_file_offs = fileOffset; @@ -478,7 +478,6 @@ bool RecoveryManager::decodeRecord(jrec& record, } if (!done && needNextFile()) { if (!getNextFile(false)) { - checkJournalAlignment(start_file_offs); return false; } } |