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

[do-not-reply at jboss.org]

Author: borges
Date: 2011-08-12 11:10:56 -0400 (Fri, 12 Aug 2011)
New Revision: 11198

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/replication/impl/ReplicationManagerImpl.java
   branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
Log:
HORNETQ-720 Remove (some) unused replication code, add notes about messages that might be deletable.

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-08-12 15:10:15 UTC (rev 11197)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java	2011-08-12 15:10:56 UTC (rev 11198)
@@ -347,7 +347,7 @@
    }
 
    /**
-    * XXX FIXME HORNETQ-720 Method ignores the synchronization of LargeMessages and Paging.
+    * XXX FIXME HORNETQ-720 Method ignores the synchronization of Paging.
     * @param replicationManager
     * @throws HornetQException
     */
@@ -401,10 +401,12 @@
          }
          sendJournalFile(messageFiles, JournalContent.MESSAGES);
          sendJournalFile(bindingsFiles, JournalContent.BINDINGS);
+
+         storageManagerLock.writeLock().lock();
          try
          {
-            storageManagerLock.writeLock().lock();
             replicator.sendSynchronizationDone();
+            // XXX HORNETQ-720 SEND a compare journals message?
          }
          finally
          {
@@ -975,6 +977,7 @@
       }
    }
 
+   // FIXME Unused?
    public void deleteMessageTransactional(final long txID, final long queueID, final long messageID) throws Exception
    {
       readLock();

Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java	2011-08-12 15:10:15 UTC (rev 11197)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java	2011-08-12 15:10:56 UTC (rev 11198)
@@ -261,9 +261,7 @@
       }
    }
 
-   /* (non-Javadoc)
-    * @see org.hornetq.core.replication.ReplicationManager#largeMessageDelete(long)
-    */
+   /* XXX Unused? */
    public void largeMessageDelete(final long messageId)
    {
       if (enabled)

Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-08-12 15:10:15 UTC (rev 11197)
+++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java	2011-08-12 15:10:56 UTC (rev 11198)
@@ -1566,8 +1566,6 @@
 
       JournalLoadInformation[] journalInfo = loadJournals();
 
-      compareJournals(journalInfo);
-
       final ServerInfo dumper = new ServerInfo(this, pagingManager);
 
       long dumpInfoInterval = configuration.getServerDumpInterval();
@@ -1620,17 +1618,6 @@
 
    }
 
-   /**
-    * @param journalInfo
-    */
-   private void compareJournals(final JournalLoadInformation[] journalInfo) throws Exception
-   {
-      if (replicationManager != null)
-      {
-         replicationManager.compareJournals(journalInfo);
-      }
-   }
-
    private void deploySecurityFromConfiguration()
    {
       for (Map.Entry<String, Set<Role>> entry : configuration.getSecurityRoles().entrySet())