[rhmessaging-commits] rhmessaging commits: r4468 - store/trunk/cpp/lib/jrnl.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2011-07-26 15:13:11 -0400 (Tue, 26 Jul 2011)
New Revision: 4468

Modified:
   store/trunk/cpp/lib/jrnl/jcntl.cpp
Log:
BZ725859: Fix for F15 store recover failure with assertion.

Modified: store/trunk/cpp/lib/jrnl/jcntl.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jcntl.cpp	2011-07-21 09:58:55 UTC (rev 4467)
+++ store/trunk/cpp/lib/jrnl/jcntl.cpp	2011-07-26 19:13:11 UTC (rev 4468)
@@ -674,8 +674,6 @@
             hdr_ok = true;
         else
         {
-            ifsp->clear(ifsp->rdstate()&(~std::ifstream::failbit));
-            assert(!ifsp->fail() && !ifsp->bad());
             if (!jfile_cycle(fid, ifsp, lowi, rd, true))
                 return false;
         }
@@ -862,6 +860,7 @@
     {
         if (ifsp->eof() || !ifsp->good())
         {
+            ifsp->clear();
             rd._eo = ifsp->tellg(); // remember file offset before closing
             assert(rd._eo != std::numeric_limits<std::size_t>::max()); // Check for error code -1
             ifsp->close();