User: d_jencks
  Date: 02/03/08 21:23:16

  Modified:    src/main/org/jboss/deployment SARDeployer.java
  Log:
  Made SARDeployer clean up after itself if a deployment fails
  
  Revision  Changes    Path
  1.2       +50 -35    jboss-system/src/main/org/jboss/deployment/SARDeployer.java
  
  Index: SARDeployer.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss-system/src/main/org/jboss/deployment/SARDeployer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SARDeployer.java  24 Feb 2002 10:24:33 -0000      1.1
  +++ SARDeployer.java  9 Mar 2002 05:23:16 -0000       1.2
  @@ -69,7 +69,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>David Maplesden</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    *
    * <p><b>20010830 marc fleury:</b>
    * <ul>
  @@ -239,12 +239,13 @@
            {
               ObjectName service = (ObjectName)iter.next();
               
  -            // The service won't be created until explicitely dependent mbeans are 
created
  +            // The service won't be created until explicitly dependent mbeans are 
created
            serviceController.create(service);
            }
         }
         catch (Exception e) {
  -      log.error("operation failed", e);
  +      log.error("create operation failed for package " + di.url, e);
  +         destroy(di);
         throw new DeploymentException(e);
         }
      }
  @@ -271,7 +272,9 @@
            }
         }
         catch (Exception e) {
  -      log.error("operation failed", e);
  +      log.error("start operation failed on package " + di.url, e);
  +         stop(di);
  +         destroy(di);
         throw new DeploymentException(e);
         }
      }
  @@ -513,25 +516,27 @@
       * @exception DeploymentException    Thrown if the package could not be
       *                                   undeployed
       */
  -   public void stop(DeploymentInfo sdi)
  -      throws DeploymentException
  +   public void stop(DeploymentInfo di)
  +      //throws DeploymentException
      {
  -      log.debug("undeploying document " + sdi.url);
  +      log.debug("undeploying document " + di.url);
         
  -      List services = sdi.mbeans;
  +      List services = di.mbeans;
         int lastService = services.size();
   
  -      try {
  -      // stop services in reverse order.
  -      for (ListIterator i = services.listIterator(lastService); i.hasPrevious();)
  -      {
  -         ObjectName name = (ObjectName)i.previous();
  -            log.debug("stopping mbean " + name);
  +      // stop services in reverse order.
  +      for (ListIterator i = services.listIterator(lastService); i.hasPrevious();)
  +      {
  +         ObjectName name = (ObjectName)i.previous();
  +         log.debug("stopping mbean " + name);
  +         try 
  +         {
            serviceController.stop(name);
  -      }
  -      }
  -      catch (Exception e) {
  -      throw new DeploymentException(e);
  +         }
  +         catch (Exception e)
  +         {
  +            log.error("Could not stop mbean: " + name, e);
  +         } // end of try-catch
         }
      }
   
  @@ -541,29 +546,39 @@
       * @param service a <code>DeploymentInfo</code> value
       * @exception DeploymentException if an error occurs
       */
  -   public void destroy(DeploymentInfo sdi) throws DeploymentException
  +   public void destroy(DeploymentInfo di)
  +      //throws DeploymentException
      {
  -      List services = sdi.mbeans;
  +      List services = di.mbeans;
         int lastService = services.size();
   
  -      try 
  +      for (ListIterator i = services.listIterator(lastService); i.hasPrevious();)
         {
  -      for (ListIterator i = services.listIterator(lastService); i.hasPrevious();)
  +         ObjectName name = (ObjectName)i.previous();
  +         log.debug("destroying mbean " + name);
  +         try 
  +         {
  +            serviceController.destroy(name);
  +         }
  +         catch (Exception e)
            {
  -         ObjectName name = (ObjectName)i.previous();
  -            log.debug("destroying mbean " + name);
  -         serviceController.destroy(name);
  -      }
  -
  -      for (ListIterator i = services.listIterator(lastService); i.hasPrevious();)
  -         {
  -         ObjectName name = (ObjectName)i.previous();
  -            log.debug("removing mbean " + name);
  -         serviceController.remove(name);
  -      }
  +            log.error("Could not destroy mbean: " + name, e);
  +         } // end of try-catch
  +         
         }
  -      catch (Exception e) {
  -      throw new DeploymentException(e);
  +      
  +      for (ListIterator i = services.listIterator(lastService); i.hasPrevious();)
  +      {
  +         ObjectName name = (ObjectName)i.previous();
  +         log.debug("removing mbean " + name);
  +         try 
  +         {
  +            serviceController.remove(name);
  +         }
  +         catch (Exception e)
  +         {
  +            log.error("Could not remove mbean: " + name, e);
  +         } // end of try-catch
         }
      }
      
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to