[jboss-cvs] JBoss Messaging SVN: r7520 - 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-06 10:05:40 -0400 (Mon, 06 Jul 2009)
New Revision: 7520

Modified:
   trunk/src/main/org/jboss/messaging/core/journal/impl/JournalTransaction.java
Log:
Fixing NPE on NIO

Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/JournalTransaction.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/JournalTransaction.java	2009-07-03 13:28:54 UTC (rev 7519)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/JournalTransaction.java	2009-07-06 14:05:40 UTC (rev 7520)
@@ -221,11 +221,14 @@
       }
       else
       {
-         for (JournalFile file : pendingFiles)
+         if (pendingFiles != null)
          {
-            if (file != currentFile)
+            for (JournalFile file : pendingFiles)
             {
-               file.getFile().waitForClose();
+               if (file != currentFile)
+               {
+                  file.getFile().waitForClose();
+               }
             }
          }
       }
@@ -472,8 +475,7 @@
       long id;
 
       int size;
-      
-      
+
       /**
        * @param file
        * @param id