User: d_jencks
  Date: 02/04/11 22:01:39

  Modified:    src/main/org/jboss/deployment SARDeployer.java
  Log:
  fixed exception on shutdown from SARDeployer
  
  Revision  Changes    Path
  1.6       +22 -22    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SARDeployer.java  3 Apr 2002 08:18:59 -0000       1.5
  +++ SARDeployer.java  12 Apr 2002 05:01:39 -0000      1.6
  @@ -72,7 +72,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.5 $
  + * @version $Revision: 1.6 $
    *
    * <p><b>20010830 marc fleury:</b>
    * <ul>
  @@ -113,7 +113,7 @@
    *            extends="org.jboss.deployment.SubDeployerMBean"
    */
   public class SARDeployer
  -   extends ServiceMBeanSupport
  +   extends SubDeployerSupport
      implements SubDeployer, SARDeployerMBean
   {
      /** A proxy to the ServiceController. */
  @@ -591,30 +591,21 @@
         }
      }
      
  +
      /**
  -    * Get references to the MainDeployer and SerivceController
  -    * 
  -    * <p>This is the only deployer that registers with the MainDeployer here.
  +    * The startService method gets the mbeanProxies for MainDeployer
  +    * and ServiceController, used elsewhere.
       *
  -    * @param server    Our mbean server.
  -    * @param name      Our proposed object name.
  -    * @return          Our actual object name
  -    * 
  -    * @throws Exception    Thrown if we are supplied an invalid name.
  +    * @exception Exception if an error occurs
       */
  -   public ObjectName preRegister(MBeanServer server, ObjectName name)
  -      throws Exception
  +   protected void startService() throws Exception
      {
  -      super.preRegister(server, name);
  -      log.debug("ServiceDeployer preregistered with mbean server");
  -      
  +      super.startService();
         mainDeployer = (MainDeployerMBean)
         MBeanProxy.create(MainDeployerMBean.class,
                           MainDeployerMBean.OBJECT_NAME,
                              server);
   
  -      // Register with the main deployer
  -      mainDeployer.addDeployer(this);
   
         // get the controller proxy
         serviceController = (ServiceControllerMBean)
  @@ -629,17 +620,26 @@
         installURL = config.getHomeURL();
         libraryURL = config.getLibraryURL();
   
  -      return name == null ? OBJECT_NAME : name;
      }
   
      /**
  -    * <p>This is the only deployer that deregisters with the MainDeployer here.
  +    * Supply our default object name
  +    *
  +    * @param server    Our mbean server.
  +    * @param name      Our proposed object name.
  +    * @return          Our actual object name
  +    * 
  +    * @throws Exception    Thrown if we are supplied an invalid name.
       */
  -   public void preDeregister() throws Exception
  +   public ObjectName preRegister(MBeanServer server, ObjectName name)
  +      throws Exception
      {
  -      mainDeployer.removeDeployer(this);
  +      super.preRegister(server, name);
  +      log.debug("ServiceDeployer preregistered with mbean server");
  +      return name == null ? OBJECT_NAME : name;
      }
  -   
  +
  +
      protected void parseDocument(DeploymentInfo di)
         throws DeploymentException
      {
  
  
  

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

Reply via email to