cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel Kernel.java

[dain]

dain        2004/04/22 20:02:00

  Modified:    modules/kernel/src/java/org/apache/geronimo/kernel
                        Kernel.java
  Log:
  Unregister the dependency service after the kernel because the unregister
  event of kernel uses the dependency service.
  
  Revision  Changes    Path
  1.24      +4 -3      
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java
  
  Index: Kernel.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Kernel.java       13 Mar 2004 23:48:56 -0000      1.23
  +++ Kernel.java       23 Apr 2004 03:02:00 -0000      1.24
  @@ -339,15 +339,16 @@
           configurationManagerGBean = null;
   
           try {
  -            mbServer.unregisterMBean(DEPENDENCY_SERVICE);
  +            mbServer.unregisterMBean(KERNEL);
           } catch (Exception e) {
               // ignore
           }
           try {
  -            mbServer.unregisterMBean(KERNEL);
  +            mbServer.unregisterMBean(DEPENDENCY_SERVICE);
           } catch (Exception e) {
               // ignore
           }
  +
           MBeanServerFactory.releaseMBeanServer(mbServer);
           mbServer = null;
           synchronized (this) {