[jboss-cvs] JBoss Messaging SVN: r7694 - trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution.

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

Author: clebert.suconic at jboss.com
Date: 2009-08-07 19:46:33 -0400 (Fri, 07 Aug 2009)
New Revision: 7694

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java
Log:
tweak trying to avoid a few cascade failures

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java	2009-08-07 21:03:26 UTC (rev 7693)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java	2009-08-07 23:46:33 UTC (rev 7694)
@@ -103,6 +103,10 @@
    {
       checkFreePort(PORTS);
       
+      servers = new MessagingServer[MAX_SERVERS];
+
+      sfs = new ClientSessionFactory[MAX_SERVERS];
+
       super.tearDown();
    }
 
@@ -1360,9 +1364,16 @@
       {
          if (servers[nodes[i]].isStarted())
          {
-            log.info("stopping server " + nodes[i]);
-            servers[nodes[i]].stop();
-            log.info("server stopped");
+            try
+            {
+               log.info("stopping server " + nodes[i]);
+               servers[nodes[i]].stop();
+               log.info("server stopped");
+            }
+            catch (Exception e)
+            {
+               log.warn(e.getMessage(), e);
+            }
          }
       }
    }

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java	2009-08-07 21:03:26 UTC (rev 7693)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java	2009-08-07 23:46:33 UTC (rev 7694)
@@ -22,7 +22,9 @@
 
 package org.jboss.messaging.tests.integration.cluster.distribution;
 
+import org.jboss.messaging.core.client.ClientSessionFactory;
 import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.server.MessagingServer;
 
 /**
  * A SymmetricClusterTest
@@ -51,8 +53,10 @@
    protected void tearDown() throws Exception
    {
       stopServers();
-
+      
       super.tearDown();
+      
+      
    }
 
    protected boolean isNetty()
@@ -1307,7 +1311,7 @@
 
       verifyReceiveRoundRobinInSomeOrder(10, 1, 2, 3, 4);
    }
-
+   
    public void testStartStopServers() throws Exception
    {
       setupCluster();