[jboss-cvs] JBossAS SVN: r61359 - branches/Branch_4_2/testsuite/src/main/org/jboss/test/classloader/leak/test.

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

Author: bstansberry at jboss.com
Date: 2007-03-15 22:54:21 -0400 (Thu, 15 Mar 2007)
New Revision: 61359

Modified:
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java
Log:
Make cleanup more robust

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java	2007-03-16 02:48:59 UTC (rev 61358)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/classloader/leak/test/ClassloaderLeakTestBase.java	2007-03-16 02:54:21 UTC (rev 61359)
@@ -110,7 +110,7 @@
          throws Exception
    {
       try
-      {
+      {         
          undeploy(deployment);
          deployments.remove(deployment);
       }
@@ -119,7 +119,10 @@
          if (propagateFailure)
             throw e;
          else
+         {
             log.error("Exception during undeploy of " + deployment, e);
+            deployments.remove(deployment);
+         }
       }
    }
    
@@ -286,11 +289,18 @@
    
    private void removeClassLoader(String key) throws Exception
    {
-      MBeanServerConnection adaptor = delegate.getServer();
-      ObjectName on = new ObjectName(ClassLoaderTrackerMBean.OBJECT_NAME);
-      Object[] params = { key };
-      String[] signature = new String[] { String.class.getName() };
-      adaptor.invoke(on, "removeClassLoader", params, signature);
+      try
+      {
+         MBeanServerConnection adaptor = delegate.getServer();
+         ObjectName on = new ObjectName(ClassLoaderTrackerMBean.OBJECT_NAME);
+         Object[] params = { key };
+         String[] signature = new String[] { String.class.getName() };
+         adaptor.invoke(on, "removeClassLoader", params, signature);
+      }
+      catch (Exception e)
+      {
+         log.error("Caught exception removing classloader under key " + key, e);
+      }
    }
    
    private void flushSecurityCache(String domain) throws Exception