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

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

Author: clebert.suconic at jboss.com
Date: 2009-07-31 12:04:57 -0400 (Fri, 31 Jul 2009)
New Revision: 7651

Modified:
   trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
Log:
JBMESSAGING-1697 - fix for truncated file

Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2009-07-31 13:06:27 UTC (rev 7650)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2009-07-31 16:04:57 UTC (rev 7651)
@@ -2887,11 +2887,15 @@
             compactingLock.readLock().lock();
             try
             {
-               dataFiles.add(file);
-               pendingCloseFiles.remove(file);
-               if (file.getFile().isOpen())
+               // The file could be closed by compacting. On this case we need to check if the close still pending
+               // before we add it to dataFiles
+               if (pendingCloseFiles.remove(file))
                {
-                  file.getFile().close();
+                  dataFiles.add(file);
+                  if (file.getFile().isOpen())
+                  {
+                     file.getFile().close();
+                  }
                }
             }
             catch (Exception e)