[rhmessaging-commits] rhmessaging commits: r2471 - store/branches/mrg-1.0/cpp/lib/jrnl.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2008-09-15 07:41:35 -0400 (Mon, 15 Sep 2008)
New Revision: 2471

Modified:
   store/branches/mrg-1.0/cpp/lib/jrnl/deq_rec.cpp
   store/branches/mrg-1.0/cpp/lib/jrnl/enq_rec.cpp
   store/branches/mrg-1.0/cpp/lib/jrnl/jcntl.cpp
   store/branches/mrg-1.0/cpp/lib/jrnl/txn_rec.cpp
Log:
Corrected some too-strict asserts that resulted in false positives during tests

Modified: store/branches/mrg-1.0/cpp/lib/jrnl/deq_rec.cpp
===================================================================
--- store/branches/mrg-1.0/cpp/lib/jrnl/deq_rec.cpp	2008-09-12 20:18:12 UTC (rev 2470)
+++ store/branches/mrg-1.0/cpp/lib/jrnl/deq_rec.cpp	2008-09-15 11:41:35 UTC (rev 2471)
@@ -377,7 +377,7 @@
     ifsp->ignore(rec_size_dblks() * JRNL_DBLK_SIZE - rec_size());
     if (_deq_hdr._xidsize)
         chk_tail(); // Throws if tail invalid or record incomplete
-    assert(ifsp->good());
+    assert(!ifsp->fail() && !ifsp->bad());
     return true;
 }
 

Modified: store/branches/mrg-1.0/cpp/lib/jrnl/enq_rec.cpp
===================================================================
--- store/branches/mrg-1.0/cpp/lib/jrnl/enq_rec.cpp	2008-09-12 20:18:12 UTC (rev 2470)
+++ store/branches/mrg-1.0/cpp/lib/jrnl/enq_rec.cpp	2008-09-15 11:41:35 UTC (rev 2471)
@@ -515,7 +515,7 @@
     }
     ifsp->ignore(rec_size_dblks() * JRNL_DBLK_SIZE - rec_size());
     chk_tail(); // Throws if tail invalid or record incomplete
-    assert(ifsp->good());
+    assert(!ifsp->fail() && !ifsp->bad());
     return true;
 }
 

Modified: store/branches/mrg-1.0/cpp/lib/jrnl/jcntl.cpp
===================================================================
--- store/branches/mrg-1.0/cpp/lib/jrnl/jcntl.cpp	2008-09-12 20:18:12 UTC (rev 2470)
+++ store/branches/mrg-1.0/cpp/lib/jrnl/jcntl.cpp	2008-09-15 11:41:35 UTC (rev 2471)
@@ -824,7 +824,7 @@
             {
                 u_int32_t rec_dblks = jrec::size_dblks(sizeof(rec_hdr));
                 ifsp->ignore(rec_dblks * JRNL_DBLK_SIZE - sizeof(rec_hdr));
-                assert(ifsp->good());
+                assert(!ifsp->fail() && !ifsp->bad());
                 if (!jfile_cycle(fid, ifsp, lowi, rd, false))
                     return false;
             }

Modified: store/branches/mrg-1.0/cpp/lib/jrnl/txn_rec.cpp
===================================================================
--- store/branches/mrg-1.0/cpp/lib/jrnl/txn_rec.cpp	2008-09-12 20:18:12 UTC (rev 2470)
+++ store/branches/mrg-1.0/cpp/lib/jrnl/txn_rec.cpp	2008-09-15 11:41:35 UTC (rev 2471)
@@ -363,7 +363,7 @@
     }
     ifsp->ignore(rec_size_dblks() * JRNL_DBLK_SIZE - rec_size());
     chk_tail(); // Throws if tail invalid or record incomplete
-    assert(ifsp->good());
+    assert(!ifsp->fail() && !ifsp->bad());
     return true;
 }