[jboss-cvs] JBoss Messaging SVN: r5243 - in trunk: src/main/org/jboss/messaging/core/paging/impl and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2008-11-03 08:50:25 -0500 (Mon, 03 Nov 2008)
New Revision: 5243

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
   trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/MultiThreadRandomFailoverTest.java
Log:
More tweaks to get tests running better


Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java	2008-11-03 13:48:03 UTC (rev 5242)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java	2008-11-03 13:50:25 UTC (rev 5243)
@@ -192,7 +192,6 @@
       this.blockOnPersistentSend = blockOnPersistentSend;
       this.autoGroupId = autoGroupId;
       this.maxConnections = maxConnections;
-      log.info("Creating csf with send window size " + this.sendWindowSize);
    }
 
    public ClientSessionFactoryImpl(final TransportConfiguration connectorConfig,

Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java	2008-11-03 13:48:03 UTC (rev 5242)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java	2008-11-03 13:50:25 UTC (rev 5243)
@@ -131,8 +131,6 @@
 
    public PagingStore getPageStore(final SimpleString storeName) throws Exception
    {
-      validateStarted();
-
       PagingStore store = stores.get(storeName);
       if (store == null)
       {
@@ -400,14 +398,6 @@
       return pagingSPI.newStore(destinationName, queueSettingsRepository.getMatch(destinationName.toString()));
    }
 
-   private void validateStarted()
-   {
-      if (!started)
-      {
-         throw new IllegalStateException("PagingManager is not started");
-      }
-   }
-
    private long addSize(final SimpleString destination, final long size) throws Exception
    {
       final PagingStore store = getPageStore(destination);

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2008-11-03 13:48:03 UTC (rev 5242)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2008-11-03 13:50:25 UTC (rev 5243)
@@ -273,18 +273,7 @@
       {
          return;
       }
-
-      securityStore = null;
-      postOffice.stop();
-      postOffice = null;
-      securityRepository = null;
-      securityStore = null;
-      queueSettingsRepository.clear();
-      scheduledExecutor.shutdown();
-      queueFactory = null;
-      resourceManager = null;
-      serverManagement = null;
-
+      
       asyncDeliveryPool.shutdown();
 
       try
@@ -299,6 +288,17 @@
          // Ignore
       }
 
+      securityStore = null;
+      postOffice.stop();
+      postOffice = null;
+      securityRepository = null;
+      securityStore = null;
+      queueSettingsRepository.clear();
+      scheduledExecutor.shutdown();
+      queueFactory = null;
+      resourceManager = null;
+      serverManagement = null;
+
       started = false;
    }
 

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/MultiThreadRandomFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/MultiThreadRandomFailoverTest.java	2008-11-03 13:48:03 UTC (rev 5242)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/MultiThreadRandomFailoverTest.java	2008-11-03 13:50:25 UTC (rev 5243)
@@ -58,7 +58,7 @@
 
    // Constants -----------------------------------------------------
 
-   private static final int RECEIVE_TIMEOUT = 5000;
+   private static final int RECEIVE_TIMEOUT = 30000;
 
    private static final int NUM_THREADS = 10;
 
@@ -1194,7 +1194,7 @@
 
    protected int getNumIterations()
    {
-      return 20;
+      return 200000;
    }
 
    protected void setUp() throws Exception