[jboss-cvs] JBossAS SVN: r93984 - projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl.

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

Author: jesper.pedersen
Date: 2009-09-24 08:14:06 -0400 (Thu, 24 Sep 2009)
New Revision: 93984

Modified:
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java
Log:
[JBJCA-166] Catch specific exceptions for stop() and destroy()

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java	2009-09-24 12:12:15 UTC (rev 93983)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java	2009-09-24 12:14:06 UTC (rev 93984)
@@ -28,6 +28,7 @@
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -302,8 +303,6 @@
       // Release MBeanServer
       MBeanServerFactory.releaseMBeanServer(mbeanServer);
 
-      info("Shutdown complete");
-
       // Cleanup temporary environment
       if (temporaryEnvironment)
       {
@@ -362,20 +361,28 @@
          Method stopMethod = deployment.getClass().getMethod("stop", (Class[])null);
          stopMethod.invoke(deployment, (Object[])null);
       }
-      catch (Exception e)
+      catch (NoSuchMethodException nsme)
       {
          // No stop method
       }
+      catch (InvocationTargetException ite)
+      {
+         throw ite.getCause();
+      }
 
       try
       {
          Method destroyMethod = deployment.getClass().getMethod("destroy", (Class[])null);
          destroyMethod.invoke(deployment, (Object[])null);
       }
-      catch (Exception e)
+      catch (NoSuchMethodException nsme)
       {
          // No destroy method
       }
+      catch (InvocationTargetException ite)
+      {
+         throw ite.getCause();
+      }
 
       deployments.remove(deployment);
    }