You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by er...@apache.org on 2014/01/02 15:48:06 UTC

svn commit: r1554814 - in /james/server/trunk/container/cli/src/main/java/org/apache/james/cli/probe: ServerProbe.java impl/JmxServerProbe.java

Author: eric
Date: Thu Jan  2 14:48:06 2014
New Revision: 1554814

URL: http://svn.apache.org/r1554814
Log:
Close JMX Connections, patch contributed by  Phillip Odam (JAMES-1534)

Modified:
    james/server/trunk/container/cli/src/main/java/org/apache/james/cli/probe/ServerProbe.java
    james/server/trunk/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java

Modified: james/server/trunk/container/cli/src/main/java/org/apache/james/cli/probe/ServerProbe.java
URL: http://svn.apache.org/viewvc/james/server/trunk/container/cli/src/main/java/org/apache/james/cli/probe/ServerProbe.java?rev=1554814&r1=1554813&r2=1554814&view=diff
==============================================================================
--- james/server/trunk/container/cli/src/main/java/org/apache/james/cli/probe/ServerProbe.java (original)
+++ james/server/trunk/container/cli/src/main/java/org/apache/james/cli/probe/ServerProbe.java Thu Jan  2 14:48:06 2014
@@ -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.
 	 * 

Modified: james/server/trunk/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java
URL: http://svn.apache.org/viewvc/james/server/trunk/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java?rev=1554814&r1=1554813&r2=1554814&view=diff
==============================================================================
--- james/server/trunk/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java (original)
+++ james/server/trunk/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java Thu Jan  2 14:48:06 2014
@@ -43,7 +43,8 @@ public class JmxServerProbe implements S
     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,9 +87,9 @@ public class JmxServerProbe implements S
      */
     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);
             domainListProcxy = MBeanServerInvocationHandler.newProxyInstance(
@@ -108,6 +109,11 @@ public class JmxServerProbe implements S
     }
 
     @Override
+    public void close() throws IOException {
+        jmxc.close();
+    }
+    
+    @Override
     public void addUser(String userName, String password) throws Exception {
         usersRepositoryProxy.addUser(userName, password);
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org