[jboss-cvs] JBossAS SVN: r109182 - trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test.

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

Author: pferraro
Date: 2010-11-05 15:24:13 -0400 (Fri, 05 Nov 2010)
New Revision: 109182

Modified:
   trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java
Log:
Handle IllegalStateExceptions if we attempt to stop an already stopped manager.

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java	2010-11-05 19:16:12 UTC (rev 109181)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java	2010-11-05 19:24:13 UTC (rev 109182)
@@ -81,8 +81,6 @@
    @Override
    protected void tearDown() throws Exception
    {
-      super.tearDown();
-
       try
       {
          // Restore any system properties we set in setUp
@@ -95,7 +93,14 @@
          {
             if (manager != null)
             {
-               manager.stop();
+               try
+               {
+                  manager.stop();
+               }
+               catch (Throwable e)
+               {
+                  e.printStackTrace(System.err);
+               }
             }
          }
          
@@ -103,9 +108,18 @@
          {
             if (cacheContainer != null)
             {
-               cacheContainer.stop();
+               try
+               {
+                  cacheContainer.stop();
+               }
+               catch (Throwable e)
+               {
+                  e.printStackTrace(System.err);
+               }
             }
          }
+         
+         super.tearDown();
       }
       finally
       {            
@@ -741,7 +755,7 @@
       // Sleep past minIdleTime
       SessionTestUtil.sleepThread(1100);
       
-      createAndUseSession(managers[0], "4", true, true); 
+      createAndUseSession(managers[0], "4", true, true);
    }
    
    public void testTotalReplicatedRedeploy() throws Exception