[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport ...

[Ron Sigal]

  User: rsigal  
  Date: 07/05/18 22:33:19

  Modified:    src/main/org/jboss/remoting/transport  Tag: remoting_2_x
                        Connector.java
  Log:
  JBREM-747:  init() will always pass MBeanServer reference to ServerInvoker, and stop() will unregister ServerInvoker MBean.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.27.2.2  +15 -2     JBossRemoting/src/main/org/jboss/remoting/transport/Connector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Connector.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/Connector.java,v
  retrieving revision 1.27.2.1
  retrieving revision 1.27.2.2
  diff -u -b -r1.27.2.1 -r1.27.2.2
  --- Connector.java	20 Jan 2007 06:35:16 -0000	1.27.2.1
  +++ Connector.java	19 May 2007 02:33:19 -0000	1.27.2.2
  @@ -111,7 +111,7 @@
    * @author <a href="mailto:d_jencks at users.sourceforge.net">David Jencks</a>
    * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>
    * @author <a href="mailto:tom at jboss.org">Tom Elrod</a>
  - * @version $Revision: 1.27.2.1 $
  + * @version $Revision: 1.27.2.2 $
    * @jmx.mbean description = "An MBean wrapper around a ServerInvoker."
    * @jboss.xmbean
    */
  @@ -404,8 +404,12 @@
                  if (!server.isRegistered(objName))
                  {
                     server.registerMBean(invoker, objName);
  -                  invoker.setMBeanServer(server);
                  }
  +               else
  +               {
  +                  log.warn(objName + " is already registered with MBeanServer");
  +               }
  +               invoker.setMBeanServer(server);
               }
               catch (Throwable e)
               {
  @@ -737,6 +741,15 @@
         {
            if (invoker != null)
            {
  +            try
  +            {
  +               ObjectName objName = new ObjectName(invoker.getMBeanObjectName());
  +               server.unregisterMBean(objName);
  +            }
  +            catch (Exception e)
  +            {
  +               log.error("invalid Object Name", e);
  +            }  
               invoker.stop();
               invoker.destroy();
               InvokerRegistry.destroyServerInvoker(invoker);