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

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

Author: clebert.suconic at jboss.com
Date: 2009-06-05 01:28:41 -0400 (Fri, 05 Jun 2009)
New Revision: 7213

Modified:
   trunk/src/main/org/jboss/messaging/core/asyncio/impl/TimedBuffer.java
   trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
Log:
Fixing possible NPE during shutdown if file was closed before Buffer

Modified: trunk/src/main/org/jboss/messaging/core/asyncio/impl/TimedBuffer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/asyncio/impl/TimedBuffer.java	2009-06-05 04:42:05 UTC (rev 7212)
+++ trunk/src/main/org/jboss/messaging/core/asyncio/impl/TimedBuffer.java	2009-06-05 05:28:41 UTC (rev 7213)
@@ -129,7 +129,11 @@
       {
          return;
       }
-
+      
+      this.flush();
+      
+      this.bufferObserver = null;
+      
       latchTimer.down();
 
       timerRunnable.close();

Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2009-06-05 04:42:05 UTC (rev 7212)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2009-06-05 05:28:41 UTC (rev 7213)
@@ -1619,6 +1619,8 @@
             log.warn("Couldn't stop journal executor after 60 seconds");
          }
 
+         fileFactory.stop();
+
          if (currentFile != null)
          {
             currentFile.getFile().close();
@@ -1637,8 +1639,6 @@
 
          openedFiles.clear();
 
-         fileFactory.stop();
-
          state = STATE_STOPPED;
       }
       finally