Author: kpvdr Date: 2008-10-01 16:51:25 -0400 (Wed, 01 Oct 2008) New Revision: 2563 Modified: store/trunk/cpp/lib/jrnl/rfc.hpp store/trunk/cpp/rhel4-support/rhel4.patch Log: Updated RHEL4 patch - resynchronized patch with files Modified: store/trunk/cpp/lib/jrnl/rfc.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rfc.hpp 2008-10-01 20:51:12 UTC (rev 2562) +++ store/trunk/cpp/lib/jrnl/rfc.hpp 2008-10-01 20:51:25 UTC (rev 2563) @@ -83,7 +83,7 @@ * the array of file controllers allocated, then initialize() is called to set these, causing the state to move * to Inactive. * - * Once the index of the active file is known, then calling activate() will set the index and internal pointer + * Once the index of the active file is known, then calling set_findex() will set the index and internal pointer * to the currently active file controller. This moves the state to Active. * * Note that if the number of files change, then the object will have to be reset and reinitialized with a new array @@ -163,7 +163,7 @@ inline u_int16_t fid() const { return _curr_fc->fid(); } // Convenience access methods to current file controller - // Note: Call only when in open state + // Note: Do not call when not in active state virtual inline u_int32_t enqcnt() const { return _curr_fc->enqcnt(); } virtual inline u_int32_t incr_enqcnt() { return _curr_fc->incr_enqcnt(); } Modified: store/trunk/cpp/rhel4-support/rhel4.patch =================================================================== --- store/trunk/cpp/rhel4-support/rhel4.patch 2008-10-01 20:51:12 UTC (rev 2562) +++ store/trunk/cpp/rhel4-support/rhel4.patch 2008-10-01 20:51:25 UTC (rev 2563) @@ -255,7 +255,7 @@ =================================================================== --- lib/MessageStoreImpl.cpp (revision 2259) +++ lib/MessageStoreImpl.cpp (working copy) -@@ -232,10 +232,6 @@ +@@ -233,10 +233,6 @@ try { env.open(getBdbBaseDir().c_str(), DB_THREAD | DB_CREATE | DB_INIT_TXN | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_USE_ENVIRON, 0); } catch (const DbException& e) {