Merge pull request #482 from francescomari/fix/jmx-mbean-leak-on-restart

Fix JMX MBean leak during Jetty restart cycle

Author: paulrutter

http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java

@@ -252,6 +252,12 @@ private void stopJetty()
                 this.loadBalancerCustomizerTracker = null;
             }
 
+            if (this.mbeanServerTracker != null)
+            {
+                this.mbeanServerTracker.close();
+                this.mbeanServerTracker = null;
+            }
+
             try
             {
                 this.server.stop();
@@ -262,12 +268,6 @@ private void stopJetty()
             {
                 SystemLogger.LOGGER.error("Exception while stopping Jetty", e);
             }
-
-            if (this.mbeanServerTracker != null)
-            {
-                this.mbeanServerTracker.close();
-                this.mbeanServerTracker = null;
-            }
         }
     }
 

http/jetty/src/main/java/org/apache/felix/http/jetty/internal/MBeanServerTracker.java

@@ -59,6 +59,7 @@ public void removedService(ServiceReference<MBeanServer> reference, MBeanContain
     {
         if ( service != null )
         {
+            service.destroy();
             this.server.removeEventListener(service);
             super.removedService(reference, service);
         }

http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java

@@ -262,6 +262,12 @@ private void stopJetty()
                 this.loadBalancerCustomizerTracker = null;
             }
 
+            if (this.mbeanServerTracker != null)
+            {
+                this.mbeanServerTracker.close();
+                this.mbeanServerTracker = null;
+            }
+
             try
             {
                 this.server.stop();
@@ -272,12 +278,6 @@ private void stopJetty()
             {
                 SystemLogger.LOGGER.error("Exception while stopping Jetty", e);
             }
-
-            if (this.mbeanServerTracker != null)
-            {
-                this.mbeanServerTracker.close();
-                this.mbeanServerTracker = null;
-            }
         }
     }
 

http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/MBeanServerTracker.java

@@ -59,6 +59,7 @@ public void removedService(ServiceReference<MBeanServer> reference, MBeanContain
     {
         if ( service != null )
         {
+            service.destroy();
             this.server.removeEventListener(service);
             super.removedService(reference, service);
         }