[hornetq-commits] JBoss hornetq SVN: r10979 - in branches/HORNETQ-720_Replication: tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication and 1 other directory.

Wednesday, 13 July 2011


Author: borges
Date: 2011-07-13 11:34:24 -0400 (Wed, 13 Jul 2011)
New Revision: 10979

Modified:
  
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java
  
branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java
Log:
Clean up test case, remove duplicated code.

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-07-13
15:33:34 UTC (rev 10978)
+++
branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java	2011-07-13
15:34:24 UTC (rev 10979)
@@ -22,7 +22,6 @@
 import org.hornetq.api.core.HornetQException;
 import org.hornetq.api.core.SimpleString;
 import org.hornetq.api.core.client.SessionFailureListener;
-import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
 import org.hornetq.core.journal.EncodingSupport;
 import org.hornetq.core.journal.JournalLoadInformation;
 import org.hornetq.core.logging.Logger;
@@ -88,18 +87,6 @@
 
    // Constructors --------------------------------------------------
 
-   // XXX remove constructor once the other one is stable
-   @Deprecated
-   public ReplicationManagerImpl(final ClientSessionFactoryInternal sessionFactory,
-                                 final ExecutorFactory executorFactory)
-   {
-      super();
-      this.executorFactory = executorFactory;
-
-      CoreRemotingConnection conn = sessionFactory.getConnection();
-      replicatingChannel = conn.getChannel(CHANNEL_ID.REPLICATION.id, -1);
-   }
-
    /**
     * @param remotingConnection
     */

Modified:
branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java
===================================================================
---
branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java	2011-07-13
15:33:34 UTC (rev 10978)
+++
branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java	2011-07-13
15:34:24 UTC (rev 10979)
@@ -35,7 +35,6 @@
 import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.core.client.HornetQClient;
 import org.hornetq.api.core.client.ServerLocator;
-import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
 import org.hornetq.core.config.Configuration;
 import org.hornetq.core.journal.EncodingSupport;
 import org.hornetq.core.journal.IOAsyncTask;
@@ -59,7 +58,6 @@
 import org.hornetq.core.protocol.core.Packet;
 import org.hornetq.core.replication.impl.ReplicatedJournal;
 import org.hornetq.core.replication.impl.ReplicationManagerImpl;
-import org.hornetq.core.server.HornetQServer;
 import org.hornetq.core.server.ServerMessage;
 import org.hornetq.core.server.impl.HornetQServerImpl;
 import org.hornetq.core.server.impl.ServerMessageImpl;
@@ -73,10 +71,7 @@
 
 /**
  * A ReplicationTest
- *
  * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
- *
- *
  */
 public class ReplicationTest extends ServiceTestBase
 {
@@ -93,6 +88,12 @@
 
    private ScheduledExecutorService scheduledExecutor;
 
+   private HornetQServerImpl server;
+
+   private ServerLocator locator;
+
+   private ReplicationManagerImpl manager;
+
    // Static --------------------------------------------------------
 
    // Constructors --------------------------------------------------
@@ -101,241 +102,165 @@
 
    public void testBasicConnection() throws Exception
    {
+      boolean backup = true;
+      boolean netty = false;
+      setupServer(backup, netty);
+      manager = new
ReplicationManagerImpl(locator.createSessionFactory().getConnection(), factory);
+      manager.start();
+      manager.stop();
+   }
 
-      Configuration config = createDefaultConfig(false);
-
-      config.setBackup(true);
-
-      HornetQServer server = new HornetQServerImpl(config);
-
-      ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new
TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY));
-
+   private void setupServer(boolean backup, boolean netty) throws Exception
+   {
+      Configuration config = createDefaultConfig(netty);
+      config.setBackup(backup);
+      server = new HornetQServerImpl(config);
+      locator = HornetQClient.createServerLocatorWithoutHA(new
TransportConfiguration(INVM_CONNECTOR_FACTORY));
       server.start();
-
-      try
-      {
-         ReplicationManagerImpl manager = new
ReplicationManagerImpl((ClientSessionFactoryInternal) locator.createSessionFactory(),
factory);
-         manager.start();
-         manager.stop();
-      }
-      finally
-      {
-         server.stop();
-      }
    }
 
    public void testInvalidJournal() throws Exception
    {
 
-      Configuration config = createDefaultConfig(false);
+      setupServer(true, false);
 
-      config.setBackup(true);
-
-      HornetQServer server = new HornetQServerImpl(config);
-
-      ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new
TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY));
-
-      server.start();
-
+      manager = new
ReplicationManagerImpl(locator.createSessionFactory().getConnection(), factory);
+      manager.start();
       try
       {
-         ReplicationManagerImpl manager = new
ReplicationManagerImpl((ClientSessionFactoryInternal) locator.createSessionFactory(),
factory);
-         manager.start();
-         try
-         {
-            manager.compareJournals(new JournalLoadInformation[] { new
JournalLoadInformation(2, 2),
-                                                                  new
JournalLoadInformation(2, 2) });
-            Assert.fail("Exception was expected");
-         }
-         catch (HornetQException e)
-         {
-            e.printStackTrace();
-            Assert.assertEquals(HornetQException.ILLEGAL_STATE, e.getCode());
-         }
-
-         manager.compareJournals(new JournalLoadInformation[] { new
JournalLoadInformation(),
-                                                               new
JournalLoadInformation() });
-
-         manager.stop();
+         manager.compareJournals(new JournalLoadInformation[] { new
JournalLoadInformation(2, 2),
+                                                               new
JournalLoadInformation(2, 2) });
+         Assert.fail("Exception was expected");
       }
-      finally
+      catch (HornetQException e)
       {
-         server.stop();
+         e.printStackTrace();
+         Assert.assertEquals(HornetQException.ILLEGAL_STATE, e.getCode());
       }
+
+      manager.compareJournals(new JournalLoadInformation[] { new
JournalLoadInformation(), new JournalLoadInformation() });
+
    }
 
    // should throw an exception if a second server connects to the same backup
    public void testInvalidConnection() throws Exception
    {
 
-      Configuration config = createDefaultConfig(false);
+      setupServer(true, false);
 
-      config.setBackup(true);
+      manager = new
ReplicationManagerImpl(locator.createSessionFactory().getConnection(), factory);
 
-      HornetQServer server = new HornetQServerImpl(config);
+      manager.start();
 
-      ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new
TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY));
-
-      server.start();
-
       try
       {
-         ReplicationManagerImpl manager = new
ReplicationManagerImpl((ClientSessionFactoryInternal) locator.createSessionFactory(),
factory);
+         ReplicationManagerImpl manager2 =
+                  new
ReplicationManagerImpl(locator.createSessionFactory().getConnection(), factory);
 
-         manager.start();
-
-         try
-         {
-            ReplicationManagerImpl manager2 = new
ReplicationManagerImpl((ClientSessionFactoryInternal) locator.createSessionFactory(),
factory);
-
-            manager2.start();
-            Assert.fail("Exception was expected");
-         }
-         catch (Exception e)
-         {
-         }
-
-         manager.stop();
-
+         manager2.start();
+         Assert.fail("Exception was expected");
       }
-      finally
+      catch (Exception e)
       {
-         server.stop();
       }
    }
 
    public void testConnectIntoNonBackup() throws Exception
    {
+      setupServer(false, false);
 
-      Configuration config = createDefaultConfig(false);
+      manager = new
ReplicationManagerImpl(locator.createSessionFactory().getConnection(), factory);
 
-      config.setBackup(false);
-
-      HornetQServer server = new HornetQServerImpl(config);
-
-      server.start();
-
-      ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new
TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY));
-
       try
       {
-         ReplicationManagerImpl manager = new
ReplicationManagerImpl((ClientSessionFactoryInternal) locator.createSessionFactory(),
factory);
-
-         try
-         {
-            manager.start();
-            Assert.fail("Exception was expected");
-         }
-         catch (HornetQException expected)
-         {
-         }
-
-         manager.stop();
+         manager.start();
+         Assert.fail("Exception was expected");
       }
-      finally
+      catch (HornetQException expected)
       {
-         server.stop();
+         // expected
       }
    }
 
    public void testSendPackets() throws Exception
    {
+      setupServer(true, false);
 
-      Configuration config = createDefaultConfig(false);
+      StorageManager storage = getStorage();
 
-      config.setBackup(true);
+      manager = new
ReplicationManagerImpl(locator.createSessionFactory().getConnection(), factory);
+      manager.start();
 
-      HornetQServer server = new HornetQServerImpl(config);
+      Journal replicatedJournal = new ReplicatedJournal((byte)1, new FakeJournal(),
manager);
 
-      server.start();
+      replicatedJournal.appendPrepareRecord(1, new FakeData(), false);
 
-      ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new
TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY));
+      replicatedJournal.appendAddRecord(1, (byte)1, new FakeData(), false);
+      replicatedJournal.appendUpdateRecord(1, (byte)2, new FakeData(), false);
+      replicatedJournal.appendDeleteRecord(1, false);
+      replicatedJournal.appendAddRecordTransactional(2, 2, (byte)1, new FakeData());
+      replicatedJournal.appendUpdateRecordTransactional(2, 2, (byte)2, new FakeData());
+      replicatedJournal.appendCommitRecord(2, false);
 
-      try
-      {
-         StorageManager storage = getStorage();
+      replicatedJournal.appendDeleteRecordTransactional(3, 4, new FakeData());
+      replicatedJournal.appendPrepareRecord(3, new FakeData(), false);
+      replicatedJournal.appendRollbackRecord(3, false);
 
-         ReplicationManagerImpl manager = new
ReplicationManagerImpl((ClientSessionFactoryInternal) locator.createSessionFactory(),
factory);
-         manager.start();
+      blockOnReplication(storage, manager);
 
-         Journal replicatedJournal = new ReplicatedJournal((byte)1, new FakeJournal(),
manager);
+      Assert.assertEquals(0, manager.getActiveTokens().size());
 
-         replicatedJournal.appendPrepareRecord(1, new FakeData(), false);
+      ServerMessage msg = new ServerMessageImpl(1, 1024);
 
-         replicatedJournal.appendAddRecord(1, (byte)1, new FakeData(), false);
-         replicatedJournal.appendUpdateRecord(1, (byte)2, new FakeData(), false);
-         replicatedJournal.appendDeleteRecord(1, false);
-         replicatedJournal.appendAddRecordTransactional(2, 2, (byte)1, new FakeData());
-         replicatedJournal.appendUpdateRecordTransactional(2, 2, (byte)2, new
FakeData());
-         replicatedJournal.appendCommitRecord(2, false);
+      SimpleString dummy = new SimpleString("dummy");
+      msg.setAddress(dummy);
 
-         replicatedJournal.appendDeleteRecordTransactional(3, 4, new FakeData());
-         replicatedJournal.appendPrepareRecord(3, new FakeData(), false);
-         replicatedJournal.appendRollbackRecord(3, false);
+      replicatedJournal.appendAddRecordTransactional(23, 24, (byte)1, new FakeData());
 
-         blockOnReplication(storage, manager);
+      PagedMessage pgmsg = new PagedMessageImpl(msg, new long[0]);
+      manager.pageWrite(pgmsg, 1);
+      manager.pageWrite(pgmsg, 2);
+      manager.pageWrite(pgmsg, 3);
+      manager.pageWrite(pgmsg, 4);
 
-         Assert.assertEquals(0, manager.getActiveTokens().size());
+      blockOnReplication(storage, manager);
 
-         ServerMessage msg = new ServerMessageImpl(1, 1024);
+      PagingManager pagingManager =
+               createPageManager(server.getStorageManager(), server.getConfiguration(),
server.getExecutorFactory(),
+                                 server.getAddressSettingsRepository());
 
-         SimpleString dummy = new SimpleString("dummy");
-         msg.setAddress(dummy);
+      PagingStore store = pagingManager.getPageStore(dummy);
+      store.start();
+      Assert.assertEquals(4, store.getNumberOfPages());
+      store.stop();
 
-         replicatedJournal.appendAddRecordTransactional(23, 24, (byte)1, new
FakeData());
+      manager.pageDeleted(dummy, 1);
+      manager.pageDeleted(dummy, 2);
+      manager.pageDeleted(dummy, 3);
+      manager.pageDeleted(dummy, 4);
+      manager.pageDeleted(dummy, 5);
+      manager.pageDeleted(dummy, 6);
 
-         PagedMessage pgmsg = new PagedMessageImpl(msg, new long[0]);
-         manager.pageWrite(pgmsg, 1);
-         manager.pageWrite(pgmsg, 2);
-         manager.pageWrite(pgmsg, 3);
-         manager.pageWrite(pgmsg, 4);
+      blockOnReplication(storage, manager);
 
-         blockOnReplication(storage, manager);
+      ServerMessageImpl serverMsg = new ServerMessageImpl();
+      serverMsg.setMessageID(500);
+      serverMsg.setAddress(new SimpleString("tttt"));
 
-         PagingManager pagingManager = createPageManager(server.getStorageManager(),
-                                                         server.getConfiguration(),
-                                                         server.getExecutorFactory(),
-                                                        
server.getAddressSettingsRepository());
+      HornetQBuffer buffer = HornetQBuffers.dynamicBuffer(100);
+      serverMsg.encodeHeadersAndProperties(buffer);
 
-         PagingStore store = pagingManager.getPageStore(dummy);
-         store.start();
-         Assert.assertEquals(4, store.getNumberOfPages());
-         store.stop();
+      manager.largeMessageBegin(500);
 
-         manager.pageDeleted(dummy, 1);
-         manager.pageDeleted(dummy, 2);
-         manager.pageDeleted(dummy, 3);
-         manager.pageDeleted(dummy, 4);
-         manager.pageDeleted(dummy, 5);
-         manager.pageDeleted(dummy, 6);
+      manager.largeMessageWrite(500, new byte[1024]);
 
-         blockOnReplication(storage, manager);
+      manager.largeMessageDelete(500);
 
-         ServerMessageImpl serverMsg = new ServerMessageImpl();
-         serverMsg.setMessageID(500);
-         serverMsg.setAddress(new SimpleString("tttt"));
+      blockOnReplication(storage, manager);
 
-         HornetQBuffer buffer = HornetQBuffers.dynamicBuffer(100);
-         serverMsg.encodeHeadersAndProperties(buffer);
+      store.start();
 
-         manager.largeMessageBegin(500);
-
-         manager.largeMessageWrite(500, new byte[1024]);
-
-         manager.largeMessageDelete(500);
-
-         blockOnReplication(storage, manager);
-
-         store.start();
-
-         Assert.assertEquals(0, store.getNumberOfPages());
-
-         manager.stop();
-      }
-      finally
-      {
-         server.stop();
-      }
+      Assert.assertEquals(0, store.getNumberOfPages());
    }
 
    public void testSendPacketsWithFailure() throws Exception
@@ -351,49 +276,43 @@
 
       config.setInterceptorClassNames(intercepts);
 
-      HornetQServer server = new HornetQServerImpl(config);
+      server = new HornetQServerImpl(config);
 
       server.start();
 
-      ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new
TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY));
+      locator = HornetQClient.createServerLocatorWithoutHA(new
TransportConfiguration(INVM_CONNECTOR_FACTORY));
 
-      try
-      {
-         StorageManager storage = getStorage();
-         ReplicationManagerImpl manager = new
ReplicationManagerImpl((ClientSessionFactoryInternal) locator.createSessionFactory(),
factory);
-         manager.start();
+      StorageManager storage = getStorage();
+      manager = new
ReplicationManagerImpl(locator.createSessionFactory().getConnection(), factory);
+      manager.start();
 
-         Journal replicatedJournal = new ReplicatedJournal((byte)1, new FakeJournal(),
manager);
+      Journal replicatedJournal = new ReplicatedJournal((byte)1, new FakeJournal(),
manager);
 
-         TestInterceptor.value.set(false);
+      TestInterceptor.value.set(false);
 
-         for (int i = 0; i < 500; i++)
+      for (int i = 0; i < 500; i++)
+      {
+         replicatedJournal.appendAddRecord(i, (byte)1, new FakeData(), false);
+      }
+
+      final CountDownLatch latch = new CountDownLatch(1);
+      storage.afterCompleteOperations(new IOAsyncTask()
+      {
+
+         public void onError(final int errorCode, final String errorMessage)
          {
-            replicatedJournal.appendAddRecord(i, (byte)1, new FakeData(), false);
          }
 
-         final CountDownLatch latch = new CountDownLatch(1);
-         storage.afterCompleteOperations(new IOAsyncTask()
+         public void done()
          {
+            latch.countDown();
+         }
+      });
 
-            public void onError(final int errorCode, final String errorMessage)
-            {
-            }
+      server.stop();
 
-            public void done()
-            {
-               latch.countDown();
-            }
-         });
+      Assert.assertTrue(latch.await(50, TimeUnit.SECONDS));
 
-         server.stop();
-
-         Assert.assertTrue(latch.await(50, TimeUnit.SECONDS));
-      }
-      finally
-      {
-         server.stop();
-      }
    }
 
    public void testExceptionSettingActionBefore() throws Exception
@@ -510,11 +429,11 @@
 
    public void testNoServer() throws Exception
    {
-      ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new
TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY));
+      locator = HornetQClient.createServerLocatorWithoutHA(new
TransportConfiguration(INVM_CONNECTOR_FACTORY));
 
       try
       {
-         ReplicationManagerImpl manager = new
ReplicationManagerImpl((ClientSessionFactoryInternal) locator.createSessionFactory(),
factory);
+         manager = new
ReplicationManagerImpl(locator.createSessionFactory().getConnection(), factory);
          manager.start();
          Assert.fail("Exception expected");
       }
@@ -527,119 +446,86 @@
    public void testNoActions() throws Exception
    {
 
-      Configuration config = createDefaultConfig(false);
+      setupServer(true, false);
+      StorageManager storage = getStorage();
+      manager = new
ReplicationManagerImpl(locator.createSessionFactory().getConnection(), factory);
+      manager.start();
 
-      config.setBackup(true);
+      Journal replicatedJournal = new ReplicatedJournal((byte)1, new FakeJournal(),
manager);
 
-      HornetQServer server = new HornetQServerImpl(config);
+      replicatedJournal.appendPrepareRecord(1, new FakeData(), false);
 
-      server.start();
-
-      ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new
TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY));
-
-      try
+      final CountDownLatch latch = new CountDownLatch(1);
+      storage.afterCompleteOperations(new IOAsyncTask()
       {
-         StorageManager storage = getStorage();
-         ReplicationManagerImpl manager = new
ReplicationManagerImpl((ClientSessionFactoryInternal) locator.createSessionFactory(),
factory);
-         manager.start();
 
-         Journal replicatedJournal = new ReplicatedJournal((byte)1, new FakeJournal(),
manager);
+         public void onError(final int errorCode, final String errorMessage)
+         {
+         }
 
-         replicatedJournal.appendPrepareRecord(1, new FakeData(), false);
-
-         final CountDownLatch latch = new CountDownLatch(1);
-         storage.afterCompleteOperations(new IOAsyncTask()
+         public void done()
          {
+            latch.countDown();
+         }
+      });
 
-            public void onError(final int errorCode, final String errorMessage)
-            {
-            }
+      Assert.assertTrue(latch.await(1, TimeUnit.SECONDS));
 
-            public void done()
-            {
-               latch.countDown();
-            }
-         });
-
-         Assert.assertTrue(latch.await(1, TimeUnit.SECONDS));
-
-         Assert.assertEquals(0, manager.getActiveTokens().size());
-         manager.stop();
-      }
-      finally
-      {
-         server.stop();
-      }
+      Assert.assertEquals(0, manager.getActiveTokens().size());
    }
 
    public void testOrderOnNonPersistency() throws Exception
    {
 
-      Configuration config = createDefaultConfig(false);
+      setupServer(true, false);
 
-      config.setBackup(true);
+      final ArrayList<Integer> executions = new ArrayList<Integer>();
 
-      HornetQServer server = new HornetQServerImpl(config);
+      StorageManager storage = getStorage();
+      manager = new
ReplicationManagerImpl(locator.createSessionFactory().getConnection(), factory);
+      manager.start();
 
-      server.start();
+      Journal replicatedJournal = new ReplicatedJournal((byte)1, new FakeJournal(),
manager);
 
-      ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new
TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY));
+      int numberOfAdds = 200;
 
-      final ArrayList<Integer> executions = new ArrayList<Integer>();
+      final CountDownLatch latch = new CountDownLatch(numberOfAdds);
 
-      try
+      OperationContext ctx = storage.getContext();
+
+      for (int i = 0; i < numberOfAdds; i++)
       {
-         StorageManager storage = getStorage();
-         ReplicationManagerImpl manager = new
ReplicationManagerImpl((ClientSessionFactoryInternal) locator.createSessionFactory(),
factory);
-         manager.start();
+         final int nAdd = i;
 
-         Journal replicatedJournal = new ReplicatedJournal((byte)1, new FakeJournal(),
manager);
+         if (i % 2 == 0)
+         {
+            replicatedJournal.appendPrepareRecord(i, new FakeData(), false);
+         }
 
-         int numberOfAdds = 200;
-
-         final CountDownLatch latch = new CountDownLatch(numberOfAdds);
-
-         OperationContext ctx = storage.getContext();
-
-         for (int i = 0; i < numberOfAdds; i++)
+         ctx.executeOnCompletion(new IOAsyncTask()
          {
-            final int nAdd = i;
 
-            if (i % 2 == 0)
+            public void onError(final int errorCode, final String errorMessage)
             {
-               replicatedJournal.appendPrepareRecord(i, new FakeData(), false);
             }
 
-            ctx.executeOnCompletion(new IOAsyncTask()
+            public void done()
             {
+               System.out.println("Add " + nAdd);
+               executions.add(nAdd);
+               latch.countDown();
+            }
+         });
+      }
 
-               public void onError(final int errorCode, final String errorMessage)
-               {
-               }
+      Assert.assertTrue(latch.await(10, TimeUnit.SECONDS));
 
-               public void done()
-               {
-                  System.out.println("Add " + nAdd);
-                  executions.add(nAdd);
-                  latch.countDown();
-               }
-            });
-         }
-
-         Assert.assertTrue(latch.await(10, TimeUnit.SECONDS));
-
-         for (int i = 0; i < numberOfAdds; i++)
-         {
-            Assert.assertEquals(i, executions.get(i).intValue());
-         }
-
-         Assert.assertEquals(0, manager.getActiveTokens().size());
-         manager.stop();
-      }
-      finally
+      for (int i = 0; i < numberOfAdds; i++)
       {
-         server.stop();
+         Assert.assertEquals(i, executions.get(i).intValue());
       }
+
+      Assert.assertEquals(0, manager.getActiveTokens().size());
    }
 
    class FakeData implements EncodingSupport
@@ -654,9 +540,6 @@
          buffer.writeBytes(new byte[5]);
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.EncodingSupport#getEncodeSize()
-       */
       public int getEncodeSize()
       {
          return 5;
@@ -685,33 +568,43 @@
    @Override
    protected void tearDown() throws Exception
    {
+      if (manager != null)
+      {
+         if (manager.isStarted())
+            manager.stop();
+         manager = null;
+      }
 
+      if (server != null)
+      {
+         if (server.isStarted())
+            server.stop();
+         server = null;
+      }
+
       executor.shutdown();
 
       scheduledExecutor.shutdown();
 
       tFactory = null;
-
       scheduledExecutor = null;
 
       super.tearDown();
 
    }
 
-
-   protected PagingManager createPageManager(final StorageManager storageManager,
-                                             final Configuration configuration,
-                                             final ExecutorFactory executorFactory,
-                                             final
HierarchicalRepository<AddressSettings> addressSettingsRepository) throws Exception
+   protected
+            PagingManager
+            createPageManager(final StorageManager storageManager,
+                              final Configuration configuration,
+                              final ExecutorFactory executorFactory,
+                              final HierarchicalRepository<AddressSettings>
addressSettingsRepository) throws Exception
    {
 
-      PagingManager paging = new PagingManagerImpl(new
PagingStoreFactoryNIO(configuration.getPagingDirectory(),
-                                                                             1000,
-                                                                             null,
-                                                                            
executorFactory,
-                                                                             false),
-                                                   storageManager,
-                                                   addressSettingsRepository);
+      PagingManager paging =
+               new PagingManagerImpl(new
PagingStoreFactoryNIO(configuration.getPagingDirectory(), 1000, null,
+                                                               executorFactory, false),
storageManager,
+                                     addressSettingsRepository);
 
       paging.start();
       return paging;
@@ -734,25 +627,22 @@
    static class FakeJournal implements Journal
    {
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendAddRecord(long, byte, byte[],
boolean)
-       */
-      public void appendAddRecord(final long id, final byte recordType, final byte[]
record, final boolean sync) throws Exception
+      public
+               void
+               appendAddRecord(final long id, final byte recordType, final byte[] record,
final boolean sync) throws Exception
       {
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendAddRecord(long, byte,
org.hornetq.core.journal.EncodingSupport, boolean)
-       */
-      public void appendAddRecord(final long id, final byte recordType, final
EncodingSupport record, final boolean sync) throws Exception
+      public
+               void appendAddRecord(final long id,
+                                    final byte recordType,
+                                    final EncodingSupport record,
+                                    final boolean sync) throws Exception
       {
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendAddRecordTransactional(long, long,
byte, byte[])
-       */
       public void appendAddRecordTransactional(final long txID,
                                                final long id,
                                                final byte recordType,
@@ -761,9 +651,6 @@
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendAddRecordTransactional(long, long,
byte, org.hornetq.core.journal.EncodingSupport)
-       */
       public void appendAddRecordTransactional(final long txID,
                                                final long id,
                                                final byte recordType,
@@ -772,81 +659,59 @@
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendCommitRecord(long, boolean)
-       */
       public void appendCommitRecord(final long txID, final boolean sync) throws
Exception
       {
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendDeleteRecord(long, boolean)
-       */
       public void appendDeleteRecord(final long id, final boolean sync) throws Exception
       {
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long,
long, byte[])
-       */
       public void appendDeleteRecordTransactional(final long txID, final long id, final
byte[] record) throws Exception
       {
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long,
long, org.hornetq.core.journal.EncodingSupport)
-       */
-      public void appendDeleteRecordTransactional(final long txID, final long id, final
EncodingSupport record) throws Exception
+      public
+               void
+               appendDeleteRecordTransactional(final long txID, final long id, final
EncodingSupport record) throws Exception
       {
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendDeleteRecordTransactional(long,
long)
-       */
       public void appendDeleteRecordTransactional(final long txID, final long id) throws
Exception
       {
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long,
org.hornetq.core.journal.EncodingSupport, boolean)
-       */
-      public void appendPrepareRecord(final long txID, final EncodingSupport
transactionData, final boolean sync) throws Exception
+      public
+               void
+               appendPrepareRecord(final long txID, final EncodingSupport
transactionData, final boolean sync) throws Exception
       {
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, byte[],
boolean)
-       */
-      public void appendPrepareRecord(final long txID, final byte[] transactionData,
final boolean sync) throws Exception
+      public
+               void
+               appendPrepareRecord(final long txID, final byte[] transactionData, final
boolean sync) throws Exception
       {
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendRollbackRecord(long, boolean)
-       */
       public void appendRollbackRecord(final long txID, final boolean sync) throws
Exception
       {
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, byte[],
boolean)
-       */
-      public void appendUpdateRecord(final long id, final byte recordType, final byte[]
record, final boolean sync) throws Exception
+      public
+               void
+               appendUpdateRecord(final long id, final byte recordType, final byte[]
record, final boolean sync) throws Exception
       {
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte,
org.hornetq.core.journal.EncodingSupport, boolean)
-       */
       public void appendUpdateRecord(final long id,
                                      final byte recordType,
                                      final EncodingSupport record,
@@ -855,9 +720,6 @@
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendUpdateRecordTransactional(long,
long, byte, byte[])
-       */
       public void appendUpdateRecordTransactional(final long txID,
                                                   final long id,
                                                   final byte recordType,
@@ -866,9 +728,6 @@
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendUpdateRecordTransactional(long,
long, byte, org.hornetq.core.journal.EncodingSupport)
-       */
       public void appendUpdateRecordTransactional(final long txID,
                                                   final long id,
                                                   final byte recordType,
@@ -877,27 +736,18 @@
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#getAlignment()
-       */
       public int getAlignment() throws Exception
       {
 
          return 0;
       }
 
-      /* (non-Javadoc)
-       * @see
org.hornetq.core.journal.Journal#load(org.hornetq.core.journal.LoaderCallback)
-       */
       public JournalLoadInformation load(final LoaderCallback reloadManager) throws
Exception
       {
 
          return new JournalLoadInformation();
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#load(java.util.List, java.util.List,
org.hornetq.core.journal.TransactionFailureCallback)
-       */
       public JournalLoadInformation load(final List<RecordInfo> committedRecords,
                                          final List<PreparedTransactionInfo>
preparedTransactions,
                                          final TransactionFailureCallback
transactionFailure) throws Exception
@@ -906,58 +756,37 @@
          return new JournalLoadInformation();
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#perfBlast(int)
-       */
       public void perfBlast(final int pages) throws Exception
       {
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.server.HornetQComponent#isStarted()
-       */
       public boolean isStarted()
       {
 
          return false;
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.server.HornetQComponent#start()
-       */
       public void start() throws Exception
       {
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.server.HornetQComponent#stop()
-       */
       public void stop() throws Exception
       {
 
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#loadInternalOnly()
-       */
       public JournalLoadInformation loadInternalOnly() throws Exception
       {
          return new JournalLoadInformation();
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#getNumberOfRecords()
-       */
       public int getNumberOfRecords()
       {
          return 0;
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendAddRecord(long, byte, byte[],
boolean, org.hornetq.core.journal.IOCompletion)
-       */
       public void appendAddRecord(final long id,
                                   final byte recordType,
                                   final byte[] record,
@@ -966,9 +795,6 @@
       {
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendAddRecord(long, byte,
org.hornetq.core.journal.EncodingSupport, boolean, org.hornetq.core.journal.IOCompletion)
-       */
       public void appendAddRecord(final long id,
                                   final byte recordType,
                                   final EncodingSupport record,
@@ -977,23 +803,16 @@
       {
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendCommitRecord(long, boolean,
org.hornetq.core.journal.IOCompletion)
-       */
       public void appendCommitRecord(final long txID, final boolean sync, final
IOCompletion callback) throws Exception
       {
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendDeleteRecord(long, boolean,
org.hornetq.core.journal.IOCompletion)
-       */
-      public void appendDeleteRecord(final long id, final boolean sync, final
IOCompletion completionCallback) throws Exception
+      public
+               void
+               appendDeleteRecord(final long id, final boolean sync, final IOCompletion
completionCallback) throws Exception
       {
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long,
org.hornetq.core.journal.EncodingSupport, boolean, org.hornetq.core.journal.IOCompletion)
-       */
       public void appendPrepareRecord(final long txID,
                                       final EncodingSupport transactionData,
                                       final boolean sync,
@@ -1001,9 +820,6 @@
       {
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendPrepareRecord(long, byte[], boolean,
org.hornetq.core.journal.IOCompletion)
-       */
       public void appendPrepareRecord(final long txID,
                                       final byte[] transactionData,
                                       final boolean sync,
@@ -1011,16 +827,12 @@
       {
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendRollbackRecord(long, boolean,
org.hornetq.core.journal.IOCompletion)
-       */
-      public void appendRollbackRecord(final long txID, final boolean sync, final
IOCompletion callback) throws Exception
+      public
+               void
+               appendRollbackRecord(final long txID, final boolean sync, final
IOCompletion callback) throws Exception
       {
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte, byte[],
boolean, org.hornetq.core.journal.IOCompletion)
-       */
       public void appendUpdateRecord(final long id,
                                      final byte recordType,
                                      final byte[] record,
@@ -1029,9 +841,6 @@
       {
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendUpdateRecord(long, byte,
org.hornetq.core.journal.EncodingSupport, boolean, org.hornetq.core.journal.IOCompletion)
-       */
       public void appendUpdateRecord(final long id,
                                      final byte recordType,
                                      final EncodingSupport record,
@@ -1040,9 +849,6 @@
       {
       }
 
-      /* (non-Javadoc)
-       * @see
org.hornetq.core.journal.Journal#sync(org.hornetq.core.journal.IOCompletion)
-       */
       public void sync(final IOCompletion callback)
       {
       }
@@ -1051,30 +857,23 @@
       {
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#getUserVersion()
-       */
       public int getUserVersion()
       {
          return 0;
       }
 
-      /* (non-Javadoc)
-       * @see org.hornetq.core.journal.Journal#appendCommitRecord(long, boolean,
org.hornetq.core.journal.IOCompletion, boolean)
-       */
-      public void appendCommitRecord(long txID, boolean sync, IOCompletion callback,
boolean lineUpContext) throws Exception
+      public
+               void
+               appendCommitRecord(long txID, boolean sync, IOCompletion callback, boolean
lineUpContext) throws Exception
       {
          // TODO Auto-generated method stub
-         
+
       }
 
-      /* (non-Javadoc)
-       * @see
org.hornetq.core.journal.Journal#lineUpContex(org.hornetq.core.journal.IOCompletion)
-       */
       public void lineUpContex(IOCompletion callback)
       {
          // TODO Auto-generated method stub
-         
+
       }
 
    }


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[hornetq-commits] JBoss hornetq SVN: r10979 - in branches/HORNETQ-720_Replication: tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication and 1 other directory.