Author: kpvdr Date: 2009-02-25 09:31:59 -0500 (Wed, 25 Feb 2009) New Revision: 3134 Modified: store/trunk/cpp/lib/jrnl/jcntl.cpp Log: Fix for BZ Bug 474366 #11 - "qpidd+store jcntl::check_owi() threw JERR_JCNTL_OWIMISMATCH on journal recovery". This bug was caused by a failure to check journal alignment when the last record read is incomplete and lies in the last logical file. Modified: store/trunk/cpp/lib/jrnl/jcntl.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jcntl.cpp 2009-02-24 22:52:33 UTC (rev 3133) +++ store/trunk/cpp/lib/jrnl/jcntl.cpp 2009-02-25 14:31:59 UTC (rev 3134) @@ -853,7 +853,10 @@ return false; } if (!done && !jfile_cycle(fid, ifsp, lowi, rd, false)) + { + check_journal_alignment(start_fid, start_file_offs, rd); return false; + } } return true; }