[jboss-cvs] JBoss Messaging SVN: r5458 - trunk/src/main/org/jboss/messaging/core/journal/impl.

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

Author: clebert.suconic at jboss.com
Date: 2008-12-03 17:19:37 -0500 (Wed, 03 Dec 2008)
New Revision: 5458

Modified:
   trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
Log:
Simple math simplification (tweak)

Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2008-12-03 17:13:44 UTC (rev 5457)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2008-12-03 22:19:37 UTC (rev 5458)
@@ -656,7 +656,7 @@
          }
       }
 
-      // We should wait this outside of the lock, to increase throuput
+      // We should wait this outside of the lock, to increase throughput
       if (callback != null)
       {
          callback.waitCompletion();
@@ -1779,30 +1779,20 @@
 
          if (counter == null)
          {
-            // (III) One of the original files didn't show any record. This
-            // would still be okay if the file was reclaimed
-            boolean found = false;
-
-            for (JournalFile lookupFile : orderedFiles)
+             for (JournalFile lookupFile : orderedFiles)
             {
                if (lookupFile.getOrderingID() == ref.a)
                {
-                  // (IV) oops, we were expecting at least one record on this
+                  // (III) oops, we were expecting at least one record on this
                   // file.
                   // The file still exists and no records were found.
                   // That means the transaction crashed before complete,
                   // so this transaction is broken and needs to be ignored.
                   // This is probably a hole caused by a crash during commit.
-                  found = true;
+                  healthy = false;
                   break;
                }
             }
-            if (found)
-            {
-               healthy = false;
-
-               break;
-            }
          }
          else
          {