[hornetq-commits] JBoss hornetq SVN: r9451 - trunk/src/main/org/hornetq/core/journal/impl.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2010-07-22 00:03:53 -0400 (Thu, 22 Jul 2010)
New Revision: 9451

Modified:
   trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java
Log:
https://jira.jboss.org/browse/HORNETQ-440 - fixes

Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java	2010-07-21 23:13:23 UTC (rev 9450)
+++ trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java	2010-07-22 04:03:53 UTC (rev 9451)
@@ -436,6 +436,16 @@
             // This is what supports us from not re-filling the whole file
             int readFileId = wholeFileBuffer.getInt();
 
+            
+            // This record is from a previous file-usage. The file was
+            // reused and we need to ignore this record
+            if (readFileId != file.getRecordID())
+            {
+               wholeFileBuffer.position(pos + 1);
+               continue;
+            }
+
+
             long transactionID = 0;
 
             if (JournalImpl.isTransaction(recordType))
@@ -602,17 +612,6 @@
                continue;
             }
 
-            // This record is from a previous file-usage. The file was
-            // reused and we need to ignore this record
-            if (readFileId != file.getRecordID())
-            {
-               // If a file has damaged pendingTransactions, we make it a dataFile, and the
-               // next reclaiming will fix it
-               reader.markAsDataFile(file);
-
-               continue;
-            }
-
             wholeFileBuffer.position(oldPos);
 
             // At this point everything is checked. So we relax and just load