[hornetq-commits] JBoss hornetq SVN: r11498 - branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal.

[do-not-reply at jboss.org]

Author: borges
Date: 2011-10-10 09:34:06 -0400 (Mon, 10 Oct 2011)
New Revision: 11498

Modified:
   branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
Log:
Fix-up journal implementations broken in last commit.

Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java	2011-10-10 13:33:52 UTC (rev 11497)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java	2011-10-10 13:34:06 UTC (rev 11498)
@@ -505,17 +505,8 @@
 
    private JournalFile[] prepareJournalForCopy(Journal journal, JournalContent contentType) throws Exception
    {
-      journal.setAutoReclaim(false);
-      /*
-       * XXX HORNETQ-720 need to check whether it is safe to proceed if compacting is running
-       * (specially at the end of it)
-       */
       journal.forceMoveNextFile();
       JournalFile[] datafiles = journal.getDataFiles();
-      for (JournalFile jf : datafiles)
-      {
-         jf.setCanReclaim(false);
-      }
       replicator.sendStartSyncMessage(datafiles, contentType);
       return datafiles;
    }