--- james/server/trunk/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java	(revision 1503906)
+++ james/server/trunk/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java
@@ -43,7 +43,7 @@
     private final static String USERSREPOSITORY_OBJECT_NAME = "org.apache.james:type=component,name=usersrepository";
     private final static String MAILBOXCOPIER_OBJECT_NAME = "org.apache.james:type=component,name=mailboxcopier";
 
-    private MBeanServerConnection mbeanServerConn;
+    private JMXConnector jmxc;
     private DomainListManagementMBean domainListProcxy;
     private RecipientRewriteTableManagementMBean virtualUserTableProxy;
     private UsersRepositoryManagementMBean usersRepositoryProxy;
@@ -86,8 +86,8 @@
      */
     private void connect() throws IOException {
         JMXServiceURL jmxUrl = new JMXServiceURL(String.format(fmtUrl, host, port));
-        JMXConnector jmxc = JMXConnectorFactory.connect(jmxUrl, null);
-        mbeanServerConn = jmxc.getMBeanServerConnection();
+        jmxc = JMXConnectorFactory.connect(jmxUrl, null);
+        MBeanServerConnection mbeanServerConn = jmxc.getMBeanServerConnection();
 
         try {
             ObjectName name = new ObjectName(DOMAINLIST_OBJECT_NAME);
@@ -182,4 +182,8 @@
         mailboxCopierManagement.copy(srcBean, dstBean);
     }
 
+    @Override
+    public void close() throws IOException {
+        jmxc.close();
+    }
 }
--- james/server/trunk/container/cli/src/main/java/org/apache/james/cli/probe/impl/ServerProbe.java (revision 1503906)
+++ james/server/trunk/container/cli/src/main/java/org/apache/james/cli/probe/impl/ServerProbe.java
@@ -18,10 +18,11 @@
  ****************************************************************/
 package org.apache.james.cli.probe;
 
+import java.io.Closeable;
 import java.util.Collection;
 import java.util.Map;
 
-public interface ServerProbe {
+public interface ServerProbe extends Closeable {
 	/**
 	 * Add a user to this mail server.
 	 *