JAVA-666, JAVA-641: Created two subclasses of DBPortPool: MongoConnectionPool and Java5MongoConnectionPool. The former is an MBean and the latter is an MXBean. When creating a DBPortPool, conditionally create one or the other depending on whether java.version system property indicates that this is a 1.5 virtual machine. This should avoid JXM registration errors when running on Java 5 VMs. Also, by using MongoConnectionPool as the name of the MXBean, avoids incompatibilities in JMX implementations that require the MXBean name to be the same as the MXBean interface that it implements (minus the MXBean suffix).

Author: jyemin

src/main/com/mongodb/DBPortPool.java

@@ -36,19 +36,16 @@
 /**
  * This class is NOT part of the public API.  Be prepared for non-binary compatible changes in minor releases.
  */
-public class DBPortPool extends SimplePool<DBPort> implements MongoConnectionPoolMXBean {
+public class DBPortPool extends SimplePool<DBPort> {
 
-    @Override
     public String getHost() {
         return _addr.getHost();
     }
 
-    @Override
     public int getPort() {
         return _addr.getPort();
     }
 
-    @Override
     public synchronized ConnectionPoolStatisticsBean getStatistics() {
         return new ConnectionPoolStatisticsBean(getTotal(), getInUse(), getInUseConnections());
     }
@@ -82,7 +79,7 @@ DBPortPool get( ServerAddress addr ){
                     return p;
                 }
 
-                p = new DBPortPool( addr , _options );
+                p = createPool(addr);
                 _pools.put( addr , p);
 
                 try {
@@ -102,6 +99,14 @@ DBPortPool get( ServerAddress addr ){
             return p;
         }
 
+        private DBPortPool createPool(final ServerAddress addr) {
+            if (isJava5) {
+                return new Java5MongoConnectionPool(addr, _options);
+            } else {
+                return new MongoConnectionPool(addr, _options);
+            }
+        }
+
         void close(){
             synchronized ( _pools ){
                 for ( DBPortPool p : _pools.values() ){
@@ -126,12 +131,17 @@ private String createObjectName( ServerAddress addr ) {
             return name;
         }
 
+        static {
+            isJava5 = System.getProperty("java.version").startsWith("1.5");
+        }
+
         final MongoOptions _options;
         final Map<ServerAddress,DBPortPool> _pools = Collections.synchronizedMap( new HashMap<ServerAddress,DBPortPool>() );
         final int _serial = nextSerial.incrementAndGet();
 
         // we use this to give each Holder a different mbean name
         static AtomicInteger nextSerial = new AtomicInteger(0);
+        static final boolean isJava5;
     }
 
     // ----

src/main/com/mongodb/Java5MongoConnectionPool.java

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2008 - 2012 10gen, Inc. <http://10gen.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb;
+
+/**
+ * This class exists only so that on Java 5 the driver can create instances of a standard MBean,
+ * therefore keeping compatibility with the JMX implementation in the Java 5 JMX class libraries.
+ */
+class Java5MongoConnectionPool extends DBPortPool implements Java5MongoConnectionPoolMBean {
+
+    Java5MongoConnectionPool(ServerAddress addr, MongoOptions options) {
+        super(addr, options);
+    }
+}

src/main/com/mongodb/Java5MongoConnectionPoolMBean.java

@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) 2008 - 2012 10gen, Inc. <http://10gen.com>
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+/**
+ * A standard MBean interface for a Mongo connection pool, for use on Java 5 virtual machines.
+ * <p>
+ * This interface is NOT part of the public API.  Be prepared for non-binary compatible changes in minor releases.
+ */
+public interface Java5MongoConnectionPoolMBean {
+    /**
+     * Gets the name of the pool.
+     *
+     * @return the name of the pool
+     */
+    String getName();
+
+    /**
+     * Gets the host that this connection pool is connecting to.
+     *
+     * @return the host
+     */
+    String getHost();
+
+    /**
+     * Gets the port that this connection pool is connecting to.
+     *
+     * @return the port
+     */
+    int getPort();
+
+    /**
+     * Gets the total number of pool members, including idle and and in-use members.
+     *
+     * @return total number of members
+     */
+    int getTotal();
+
+    /**
+     * Gets the number of pool members that are currently in use.
+     *
+     * @return number of in-use members
+     */
+    int getInUse();
+
+    /**
+     * Gets the maximum allowed size of the pool, including idle and in-use members.
+     *
+     * @return the maximum size
+     */
+    int getMaxSize();
+}

src/main/com/mongodb/MongoConnectionPool.java

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2008 - 2012 10gen, Inc. <http://10gen.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb;
+
+/**
+ * This class exists only so that, on Java 6 and above, the driver can create instances of an MXBean.
+ */
+class MongoConnectionPool extends DBPortPool implements MongoConnectionPoolMXBean {
+
+    MongoConnectionPool(ServerAddress addr, MongoOptions options) {
+        super(addr, options);
+    }
+}

src/main/com/mongodb/MongoConnectionPoolMXBean.java

@@ -19,6 +19,8 @@
 import com.mongodb.util.ConnectionPoolStatisticsBean;
 
 /**
+ * A standard MXBean interface for a Mongo connection pool, for use on Java 6 and above virtual machines.
+ * <p>
  * This interface is NOT part of the public API.  Be prepared for non-binary compatible changes in minor releases.
  */
 public interface MongoConnectionPoolMXBean {