Rename to 'destroy()' #177

jolokia · Jan 13, 2015 · c4d3521 · c4d3521
1 parent 75ad0b3
commit c4d3521
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/agent/core/src/main/java/org/jolokia/backend/MBeanServerExecutorLocal.java b/agent/core/src/main/java/org/jolokia/backend/MBeanServerExecutorLocal.java
@@ -126,8 +126,8 @@ public <R extends JmxRequest> Object handleRequest(JsonRequestHandler<R> pReques
     /**
      * Lifecycle method called at the end of life for this object.
      */
-    public void unregisterFromMBeanNotifications() {
-        super.unregisterFromMBeanNotifications();
+    public void destroy() {
+        unregisterFromMBeanNotifications();
         mbeanServers.destroy();
     }
 

diff --git a/agent/core/src/main/java/org/jolokia/backend/MBeanServerHandler.java b/agent/core/src/main/java/org/jolokia/backend/MBeanServerHandler.java
@@ -88,7 +88,7 @@ private void initPlugins(LogHandler pLogHandler) {
     private MBeanPluginContext createMBeanPluginContext() {
         return new MBeanPluginContext() {
             public ObjectName registerMBean(Object pMBean, String... pOptionalName) throws MalformedObjectNameException, NotCompliantMBeanException, InstanceAlreadyExistsException {
-                return MBeanServerHandler.this.registerMBean(pMBean,pOptionalName);
+                return MBeanServerHandler.this.registerMBean(pMBean, pOptionalName);
             }
 
             public void each(ObjectName pObjectName, MBeanEachCallback pCallback) throws IOException, ReflectionException, MBeanException {
@@ -205,7 +205,7 @@ public final void destroy() throws JMException {
         }
 
         // Unregister any notification listener
-        mBeanServerManager.unregisterFromMBeanNotifications();
+        mBeanServerManager.destroy();
     }
 
     /**

diff --git a/agent/core/src/test/java/org/jolokia/handler/ListHandlerTest.java b/agent/core/src/test/java/org/jolokia/handler/ListHandlerTest.java
@@ -53,7 +53,7 @@ private void createHandler() {
 
     @AfterMethod
     private void destroy() {
-        executor.unregisterFromMBeanNotifications();
+        executor.destroy();
     }
 
     @Test