[jboss-cvs] JBoss Messaging SVN: r4734 - in trunk: tests/src/org/jboss/messaging/tests/unit/core/journal/impl and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2008-07-25 18:47:52 -0400 (Fri, 25 Jul 2008)
New Revision: 4734

Modified:
   trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AlignedJournalImplTest.java
Log:
JournalWork: 1st Reclaim should be called right after load (to deal with invalid & reused data files)

Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2008-07-25 20:34:05 UTC (rev 4733)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2008-07-25 22:47:52 UTC (rev 4734)
@@ -1128,6 +1128,8 @@
       
       state = STATE_LOADED;
       
+      checkAndReclaimFiles();
+      
       return maxMessageID;
    }
 

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AlignedJournalImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AlignedJournalImplTest.java	2008-07-25 20:34:05 UTC (rev 4733)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/AlignedJournalImplTest.java	2008-07-25 22:47:52 UTC (rev 4734)
@@ -451,10 +451,6 @@
       assertEquals(0, records.size());
       assertEquals(0, transactions.size());
       
-      assertEquals(12, factory.listFiles("tt").size());
-
-      journalImpl.checkAndReclaimFiles();
-      
       assertEquals(2, factory.listFiles("tt").size());
       
    }