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

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

Author: jesper.pedersen
Date: 2010-02-23 03:42:47 -0500 (Tue, 23 Feb 2010)
New Revision: 101321

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java
Log:
Invoke ResourceAdapter.stop() during shutdown

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2010-02-23 07:56:34 UTC (rev 101320)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2010-02-23 08:42:47 UTC (rev 101321)
@@ -600,7 +600,7 @@
 
          log.info("Deployed: " + url.toExternalForm());
 
-         return new RADeployment(url, jndiNames, cl);
+         return new RADeployment(url, resourceAdapter, jndiNames, cl);
       }
       catch (DeployException de)
       {

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java	2010-02-23 07:56:34 UTC (rev 101320)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java	2010-02-23 08:42:47 UTC (rev 101321)
@@ -32,6 +32,7 @@
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import javax.resource.spi.ResourceAdapter;
 
 import org.jboss.logging.Logger;
 import org.jboss.util.naming.Util;
@@ -44,9 +45,12 @@
 {
    private static Logger log = Logger.getLogger(RADeployer.class);
 
-   /** The resource adapter file */
-   private URL adapter;
+   /** The deployment */
+   private URL deployment;
 
+   /** The resource adapter instance */
+   private ResourceAdapter ra;
+
    /** JNDI names for connection factories */
    private List<String> jndiNames;
 
@@ -55,13 +59,15 @@
 
    /**
     * Constructor
-    * @param adapter The adapter
+    * @param deployment The deployment
+    * @param ra The resource adapter instance if present
     * @param jndiNames The JNDI names for connection factories
     * @param cl The classloader for the deployment
     */
-   public RADeployment(URL adapter, List<String> jndiNames, ClassLoader cl)
+   public RADeployment(URL deployment, ResourceAdapter ra, List<String> jndiNames, ClassLoader cl)
    {
-      this.adapter = adapter;
+      this.deployment = deployment;
+      this.ra = ra;
       this.jndiNames = jndiNames;
       this.cl = cl;
    }
@@ -72,7 +78,7 @@
     */
    public URL getURL()
    {
-      return adapter;
+      return deployment;
    }
 
    /**
@@ -85,11 +91,11 @@
    }
 
    /**
-    * Destroy
+    * Stop
     */
-   public void destroy()
+   public void stop()
    {
-      log.debug("Undeploying: " + adapter.toExternalForm());
+      log.debug("Undeploying: " + deployment.toExternalForm());
 
       if (jndiNames != null)
       {
@@ -130,7 +136,18 @@
          }
       }
 
+      if (ra != null)
+      {
+         ra.stop();
+         ra = null;
+      }
+   }
 
+   /**
+    * Destroy
+    */
+   public void destroy()
+   {
       if (cl != null && cl instanceof Closeable)
       {
          try
@@ -143,6 +160,6 @@
          }
       }
 
-      log.info("Undeployed: " + adapter.toExternalForm());
+      log.info("Undeployed: " + deployment.toExternalForm());
    }
 }