Author: kpvdr Date: 2009-01-30 07:39:00 -0500 (Fri, 30 Jan 2009) New Revision: 3083 Modified: store/trunk/cpp/lib/jrnl/rmgr.cpp Log: Stricter test for condition behind BZ480964 Modified: store/trunk/cpp/lib/jrnl/rmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/rmgr.cpp 2009-01-30 11:58:30 UTC (rev 3082) +++ store/trunk/cpp/lib/jrnl/rmgr.cpp 2009-01-30 12:39:00 UTC (rev 3083) @@ -275,7 +275,7 @@ if (pcbp) // Page reads have pcb { - if (!pcbp->_rfh->rd_void()) // Detects if write reset of this fcntl obj has occurred. + if (pcbp->_rfh->rd_subm_cnt_dblks() >= JRNL_SBLK_SIZE) // Detects if write reset of this fcntl obj has occurred. { // Increment the completed read offset // NOTE: We cannot use _rrfc here, as it may have rotated since submitting count. @@ -288,7 +288,7 @@ } else // File header reads have no pcb { - if (!_rrfc.is_void()) + if (!_rrfc.subm_cnt_dblks() >= JRNL_SBLK_SIZE) { std::memcpy(&_fhdr, _fhdr_buffer, sizeof(file_hdr)); _rrfc.add_cmpl_cnt_dblks(JRNL_SBLK_SIZE);