[rhmessaging-commits] rhmessaging commits: r2311 - in store/branches/mrg-1.0/cpp: rhel4-support and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2008-08-14 16:40:44 -0400 (Thu, 14 Aug 2008)
New Revision: 2311

Modified:
   store/branches/mrg-1.0/cpp/lib/jrnl/jcntl.cpp
   store/branches/mrg-1.0/cpp/rhel4-support/rhel4.patch
Log:
Minor corrections

Modified: store/branches/mrg-1.0/cpp/lib/jrnl/jcntl.cpp
===================================================================
--- store/branches/mrg-1.0/cpp/lib/jrnl/jcntl.cpp	2008-08-14 18:50:27 UTC (rev 2310)
+++ store/branches/mrg-1.0/cpp/lib/jrnl/jcntl.cpp	2008-08-14 20:40:44 UTC (rev 2311)
@@ -1043,8 +1043,7 @@
     
     // Write abort record
     txn_rec ar(amagic, ++rd._h_rid, xid.data(), xid.size(), rd._owi);
-    u_int32_t res = ar.encode(buff, 0, abort_dblks);
-    assert(res == abort_dblks);
+    ar.encode(buff, 0, abort_dblks);
     ofs.write((const char*)buff, JRNL_DBLK_SIZE);
     assert(!ofs.fail());
     // log write action

Modified: store/branches/mrg-1.0/cpp/rhel4-support/rhel4.patch
===================================================================
--- store/branches/mrg-1.0/cpp/rhel4-support/rhel4.patch	2008-08-14 18:50:27 UTC (rev 2310)
+++ store/branches/mrg-1.0/cpp/rhel4-support/rhel4.patch	2008-08-14 20:40:44 UTC (rev 2311)
@@ -253,7 +253,7 @@
 ===================================================================
 --- lib/BdbMessageStore.cpp	(revision 2179)
 +++ lib/BdbMessageStore.cpp	(working copy)
-@@ -224,10 +224,6 @@
+@@ -226,10 +226,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) {