[JAVA-318] JMX cleanup

Author: scotthernandez

src/main/com/mongodb/DBPortPool.java

@@ -18,17 +18,15 @@
 
 package com.mongodb;
 
-import com.mongodb.util.*;
-
-import java.io.*;
-import java.net.*;
+import java.lang.management.ManagementFactory;
 import java.util.*;
-import java.util.concurrent.*;
-import java.util.logging.*;
+import java.util.concurrent.Semaphore;
+import java.util.logging.Level;
 
-import java.lang.management.*;
 import javax.management.*;
 
+import com.mongodb.util.SimplePool;
+
 public class DBPortPool extends SimplePool<DBPort> {
 
     static class Holder {
@@ -103,7 +101,7 @@ void close(){
         }
 
         private ObjectName createObjectName( ServerAddress addr ) throws MalformedObjectNameException {
-            return new ObjectName( "com.mongodb:type=ConnectionPool,host=" + addr.toString().replace( ':' , '_' ) );
+            return new ObjectName( "com.mongodb:type=ConnectionPool,host=" + addr.toString().replace( ":" , ",port=" ) + ",instance=" + hashCode() );
         }
 
         final MongoOptions _options;
@@ -138,10 +136,10 @@ public static class ConnectionWaitTimeOut extends NoMoreConnection {
     // ----
 
     DBPortPool( ServerAddress addr , MongoOptions options ){
-        super( "DBPortPool-" + addr.toString() , options.connectionsPerHost , options.connectionsPerHost );
+        super( "DBPortPool-" + addr.toString() + ", options = " +  options.toString() , options.connectionsPerHost , options.connectionsPerHost );
         _options = options;
         _addr = addr;
-	_waitingSem = new Semaphore( _options.connectionsPerHost * _options.threadsAllowedToBlockForConnectionMultiplier );
+        _waitingSem = new Semaphore( _options.connectionsPerHost * _options.threadsAllowedToBlockForConnectionMultiplier );
     }
 
     protected long memSize( DBPort p ){

src/main/com/mongodb/util/SimplePool.java

@@ -19,9 +19,9 @@
 package com.mongodb.util;
 
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 
-import java.lang.management.*;
 import javax.management.*;
 
 public abstract class SimplePool<T> implements DynamicMBean {
@@ -48,6 +48,14 @@ public SimplePool( String name , int maxToKeep , int maxTotal , boolean trackLea
         _maxTotal = maxTotal;
         _trackLeaks = trackLeaks || TRACK_LEAKS;
         _debug = debug;
+        _mbeanInfo = new MBeanInfo( this.getClass().getName() , _name , 
+                new MBeanAttributeInfo[]{
+                    new MBeanAttributeInfo( "name" , "java.lang.String" , "name of pool" , true , false , false ) , 
+                    new MBeanAttributeInfo( "size" , "java.lang.Integer" , "total size of pool" , true , false , false ) , 
+                    new MBeanAttributeInfo( "available" , "java.lang.Integer" , "total connections available" , true , false , false ) , 
+                    new MBeanAttributeInfo( "inUse" , "java.lang.Integer" , "number connections in use right now" , true , false , false ) , 
+                    new MBeanAttributeInfo( "everCreated" , "java.lang.Integer" , "number connections ever created" , true , false , false ) 
+                } , null , null , null );
 
     }
 
@@ -295,14 +303,7 @@ public AttributeList getAttributes(String[] attributes){
     }
 
     public MBeanInfo getMBeanInfo(){
-        return new MBeanInfo( this.getClass().getName() , _name , 
-                              new MBeanAttributeInfo[]{
-                                  new MBeanAttributeInfo( "name" , "java.lang.String" , "name of pool" , true , false , false ) , 
-                                  new MBeanAttributeInfo( "size" , "java.lang.Integer" , "total size of pool" , true , false , false ) , 
-                                  new MBeanAttributeInfo( "available" , "java.lang.Integer" , "total connections available" , true , false , false ) , 
-                                  new MBeanAttributeInfo( "inUse" , "java.lang.Integer" , "number connections in use right now" , true , false , false ) , 
-                                  new MBeanAttributeInfo( "everCreated" , "java.lang.Integer" , "numbe connections ever created" , true , false , false ) 
-                              } , null , null , null );
+        return _mbeanInfo;
     }
 
     public Object invoke(String actionName, Object[] params, String[] signature){
@@ -335,6 +336,7 @@ public String toString(){
     protected final int _maxTotal;
     protected final boolean _trackLeaks;
     protected final boolean _debug;
+    protected final MBeanInfo _mbeanInfo;
 
     private final List<T> _avail = new ArrayList<T>();
     protected final List<T> _availSafe = Collections.unmodifiableList( _avail );