activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r646352 - /activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java
Date Wed, 09 Apr 2008 13:54:22 GMT
Author: chirino
Date: Wed Apr  9 06:54:20 2008
New Revision: 646352

URL: http://svn.apache.org/viewvc?rev=646352&view=rev
Log:
Patch applied for AMQ-1380

Modified:
    activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java

Modified: activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java
URL: http://svn.apache.org/viewvc/activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java?rev=646352&r1=646351&r2=646352&view=diff
==============================================================================
--- activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java
(original)
+++ activemq/activeio/trunk/activeio-core/src/main/java/org/apache/activeio/journal/active/LogFileManager.java
Wed Apr  9 06:54:20 2008
@@ -105,7 +105,8 @@
     }
 
     void initialize(int onlineLogFileCount) throws IOException {
-
+      try
+      {
         LogFileNode logFiles[] = new LogFileNode[onlineLogFileCount];
 
         // Create the log directory if it does not exist.
@@ -176,6 +177,12 @@
                     
         loadedFromCleanShutDown = false;
         storeState();
+      }
+      catch (JournalLockedException e)
+      {
+        controlFile.dispose();
+        throw e;
+      }
     }
 
     private void checkAppendLog() throws IOException {



Mime
View raw message