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

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2008-11-14 14:30:06 -0500 (Fri, 14 Nov 2008)
New Revision: 2804

Modified:
   store/trunk/cpp/lib/jrnl/jcntl.cpp
Log:
Fix for BZ470228 - "Abort on starting journal with changed sizing params"

Modified: store/trunk/cpp/lib/jrnl/jcntl.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jcntl.cpp	2008-11-14 17:52:18 UTC (rev 2803)
+++ store/trunk/cpp/lib/jrnl/jcntl.cpp	2008-11-14 19:30:06 UTC (rev 2804)
@@ -142,12 +142,8 @@
 
     _lfmgr.finalize();
 
-    // Set new file geometry parameters
     assert(num_jfiles >= JRNL_MIN_NUM_FILES);
     assert(num_jfiles <= JRNL_MAX_NUM_FILES);
-    _emap.set_num_jfiles(num_jfiles);
-    _tmap.set_num_jfiles(num_jfiles);
-
     assert(jfsize_sblks >= JRNL_MIN_FILE_SIZE);
     assert(jfsize_sblks <= JRNL_MAX_FILE_SIZE);
     _jfsize_sblks = jfsize_sblks;
@@ -559,6 +555,8 @@
         rd._njf = ji.num_jfiles();
         _rcvdat._enq_cnt_list.resize(rd._njf);
     }
+    _emap.set_num_jfiles(rd._njf);
+    _tmap.set_num_jfiles(rd._njf);
     if (_jfsize_sblks != ji.jfsize_sblks())
     {
         std::ostringstream oss;