[hornetq-commits] JBoss hornetq SVN: r11178 - in branches/HORNETQ-720_Replication: hornetq-journal/src/main/java/org/hornetq/core/journal/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: borges
Date: 2011-08-10 06:30:16 -0400 (Wed, 10 Aug 2011)
New Revision: 11178

Modified:
   branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java
   branches/HORNETQ-720_Replication/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalFilesRepository.java
Log:
HORNETQ-720 Current file must be open at the correct position.

Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java	2011-08-10 10:29:24 UTC (rev 11177)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java	2011-08-10 10:30:16 UTC (rev 11178)
@@ -403,6 +403,7 @@
                }
                // files should be already in place.
                filesReservedForSync.remove(jc);
+               getJournal(jc.typeByte).stop();
                registerJournal(jc.typeByte, journal);
                journal.loadInternalOnly();
                // XXX HORNETQ-720 must reload journals
@@ -456,7 +457,6 @@
       JournalImpl journal = assertJournalImpl(journalIf);
       Map<Long, JournalFile> mapToFill = filesReservedForSync.get(packet.getJournalContentType());
       JournalFile current = journal.createFilesForRemoteSync(packet.getFileIds(), mapToFill);
-      current.getFile().open(1, false);
       registerJournal(packet.getJournalContentType().typeByte,
                       new FileWrapperJournal(current, storage.hasCallbackSupport()));
      }

Modified: branches/HORNETQ-720_Replication/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalFilesRepository.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalFilesRepository.java	2011-08-10 10:29:24 UTC (rev 11177)
+++ branches/HORNETQ-720_Replication/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalFilesRepository.java	2011-08-10 10:30:16 UTC (rev 11178)
@@ -443,9 +443,13 @@
       return nextFile;
    }
 
-   public JournalFile createRemoteBackupSyncFile(long fileID, boolean init) throws Exception
+   /**
+    * Creates files for journal synchronization of a replicated backup.
+    * @param isCurrent a current file is initialized and kept open.
+    */
+   public JournalFile createRemoteBackupSyncFile(long fileID, boolean isCurrent) throws Exception
    {
-      return createFile(false, false, init, false, fileID);
+      return createFile(isCurrent, false, isCurrent, false, fileID);
    }
 
    // Package protected ---------------------------------------------