Merge branch 'release-2.9.x' into 2.10.x

Conflicts:
	build.properties
	pom.xml
	src/main/com/mongodb/DBPortPool.java
	src/main/com/mongodb/DBTCPConnector.java
	src/main/com/mongodb/Mongo.java
	src/main/com/mongodb/MongoOptions.java

Author: jyemin

src/main/com/mongodb/DBPortPool.java

@@ -103,7 +103,7 @@ DBPortPool get( ServerAddress addr ){
         }
 
         private DBPortPool createPool(final ServerAddress addr) {
-            if (isJava5) {
+            if (isJava5 || _options.isAlwaysUseMBeans()) {
                 return new Java5MongoConnectionPool(addr, _options);
             } else {
                 return new MongoConnectionPool(addr, _options);

src/main/com/mongodb/MongoClientOptions.java

@@ -23,9 +23,10 @@
 
 /**
  * Various settings to control the behavior of a <code>MongoClient</code>.
- * <p>
+ * <p/>
  * Note: This class is a replacement for {@code MongoOptions}, to be used with {@code MongoClient}.  The main difference
  * in behavior is that the default write concern is {@code WriteConcern.ACKNOWLEDGED}.
+ *
  * @see MongoClient
  * @since 2.10.0
  */
@@ -54,6 +55,7 @@ public static class Builder {
         private WriteConcern writeConcern = WriteConcern.ACKNOWLEDGED;
         private SocketFactory socketFactory = SocketFactory.getDefault();
         private boolean cursorFinalizerEnabled = true;
+        private boolean alwaysUseMBeans = false;
 
         /**
          * Sets the description.
@@ -86,7 +88,8 @@ public Builder connectionsPerHost(final int connectionsPerHost) {
         /**
          * Sets the multiplier for number of threads allowed to block waiting for a connection.
          *
-         * @param threadsAllowedToBlockForConnectionMultiplier the multiplier
+         * @param threadsAllowedToBlockForConnectionMultiplier
+         *         the multiplier
          * @return {@code this}
          * @throws IllegalArgumentException if <code>threadsAllowedToBlockForConnectionMultiplier < 1</code>
          * @see com.mongodb.MongoClientOptions#getThreadsAllowedToBlockForConnectionMultiplier()
@@ -106,7 +109,6 @@ public Builder threadsAllowedToBlockForConnectionMultiplier(final int threadsAll
          * @return {@code this}
          * @throws IllegalArgumentException if <code>maxWaitTime < 0</code>
          * @see com.mongodb.MongoClientOptions#getMaxWaitTime()
-         *
          */
         public Builder maxWaitTime(final int maxWaitTime) {
             if (maxWaitTime < 0) {
@@ -133,6 +135,7 @@ public Builder connectTimeout(final int connectTimeout) {
 
         /**
          * Sets the socket timeout.
+         *
          * @param socketTimeout the socket timeout
          * @return {@code this}
          * @see com.mongodb.MongoClientOptions#getSocketTimeout()
@@ -163,7 +166,6 @@ public Builder socketKeepAlive(final boolean socketKeepAlive) {
          * @param autoConnectRetry auto connect retry
          * @return {@code this}
          * @see MongoClientOptions#isAutoConnectRetry()
-         *
          */
         public Builder autoConnectRetry(final boolean autoConnectRetry) {
             this.autoConnectRetry = autoConnectRetry;
@@ -264,7 +266,6 @@ public Builder socketFactory(final SocketFactory socketFactory) {
          * Sets whether cursor finalizers are enabled.
          *
          * @param cursorFinalizerEnabled whether cursor finalizers are enabled.
-         *
          * @return {@code this}
          * @see MongoClientOptions#isCursorFinalizerEnabled()
          */
@@ -273,6 +274,20 @@ public Builder cursorFinalizerEnabled(final boolean cursorFinalizerEnabled) {
             return this;
         }
 
+        /**
+         * Sets whether JMX beans registered by the driver should always be MBeans, regardless of whether the VM is
+         * Java 6 or greater. If false, the driver will use MXBeans if the VM is Java 6 or greater, and use MBeans if
+         * the VM is Java 5.
+         *
+         * @param alwaysUseMBeans true if driver should always use MBeans, regardless of VM version
+         * @return this
+         * @see MongoClientOptions#isAlwaysUseMBeans()
+         */
+        public Builder alwaysUseMBeans(final boolean alwaysUseMBeans) {
+            this.alwaysUseMBeans = alwaysUseMBeans;
+            return this;
+        }
+
         /**
          * Sets defaults to be what they are in {@code MongoOptions}.
          *
@@ -297,8 +312,9 @@ public MongoClientOptions build() {
 
     /**
      * Gets the description for this MongoClient, which is used in various places like logging and JMX.
-     * <p>
+     * <p/>
      * Default is null.
+     *
      * @return the description
      */
     public String getDescription() {
@@ -309,8 +325,9 @@ public String getDescription() {
      * The maximum number of connections allowed per host for this MongoClient instance.
      * Those connections will be kept in a pool when idle.
      * Once the pool is exhausted, any operation requiring a connection will block waiting for an available connection.
-     * <p>
+     * <p/>
      * Default is 100.
+     *
      * @return the maximum size of the connection pool per host
      * @see MongoClientOptions#getThreadsAllowedToBlockForConnectionMultiplier()
      */
@@ -323,8 +340,9 @@ public int getConnectionsPerHost() {
      * may be waiting for a connection to become available from the pool. All further threads will get an exception right
      * away. For example if connectionsPerHost is 10 and threadsAllowedToBlockForConnectionMultiplier is 5, then up to 50
      * threads can wait for a connection.
-     * <p>
+     * <p/>
      * Default is 5.
+     *
      * @return the multiplier
      */
     public int getThreadsAllowedToBlockForConnectionMultiplier() {
@@ -333,8 +351,9 @@ public int getThreadsAllowedToBlockForConnectionMultiplier() {
 
     /**
      * The maximum wait time in milliseconds that a thread may wait for a connection to become available.
-     * <p>
+     * <p/>
      * Default is 120,000. A value of 0 means that it will not wait.  A negative value means to wait indefinitely.
+     *
      * @return the maximum wait time.
      */
     public int getMaxWaitTime() {
@@ -344,8 +363,9 @@ public int getMaxWaitTime() {
     /**
      * The connection timeout in milliseconds.  A value of 0 means no timeout.
      * It is used solely when establishing a new connection {@link java.net.Socket#connect(java.net.SocketAddress, int) }
-     * <p>
+     * <p/>
      * Default is 10,000.
+     *
      * @return the socket connect timeout
      */
     public int getConnectTimeout() {
@@ -355,8 +375,9 @@ public int getConnectTimeout() {
     /**
      * The socket timeout in milliseconds.
      * It is used for I/O socket read and write operations {@link java.net.Socket#setSoTimeout(int)}
-     * <p>
+     * <p/>
      * Default is 0 and means no timeout.
+     *
      * @return the socket timeout
      */
     public int getSocketTimeout() {
@@ -365,7 +386,7 @@ public int getSocketTimeout() {
 
     /**
      * This flag controls the socket keep alive feature that keeps a connection alive through firewalls {@link java.net.Socket#setKeepAlive(boolean)}
-     * <p>
+     * <p/>
      * * Default is false.
      *
      * @return whether keep-alive is enabled on each socket
@@ -382,7 +403,7 @@ public boolean isSocketKeepAlive() {
      * Note that when using this flag:
      * - for a replica set, the driver will trying to connect to the old master for that time, instead of failing over to the new one right away
      * - this does not prevent exception from being thrown in read/write operations on the socket, which must be handled by application
-     *
+     * <p/>
      * Even if this flag is false, the driver already has mechanisms to automatically recreate broken connections and retry the read operations.
      * Default is false.
      *
@@ -404,8 +425,9 @@ public long getMaxAutoConnectRetryTime() {
 
     /**
      * The read preference to use for queries, map-reduce, aggregation, and count.
-     * <p>
+     * <p/>
      * Default is {@code ReadPreference.primary()}.
+     *
      * @return the read preference
      * @see com.mongodb.ReadPreference#primary()
      */
@@ -433,8 +455,9 @@ public DBEncoderFactory getDbEncoderFactory() {
 
     /**
      * The write concern to use.
-     * <p>
+     * <p/>
      * Default is {@code WriteConcern.ACKNOWLEDGED}.
+     *
      * @return the write concern
      * @see WriteConcern#ACKNOWLEDGED
      */
@@ -444,7 +467,7 @@ public WriteConcern getWriteConcern() {
 
     /**
      * The socket factory for creating sockets to the mongo server.
-     * <p>
+     * <p/>
      * Default is SocketFactory.getDefault()
      *
      * @return the socket factory
@@ -454,9 +477,9 @@ public SocketFactory getSocketFactory() {
     }
 
     /**
-     * Sets whether there is a a finalize method created that cleans up instances of DBCursor that the client
+     * Gets whether there is a a finalize method created that cleans up instances of DBCursor that the client
      * does not close.  If you are careful to always call the close method of DBCursor, then this can safely be set to false.
-     * <p>
+     * <p/>
      * Default is true.
      *
      * @return whether finalizers are enabled on cursors
@@ -467,6 +490,18 @@ public boolean isCursorFinalizerEnabled() {
         return cursorFinalizerEnabled;
     }
 
+    /**
+     * Gets whether JMX beans registered by the driver should always be MBeans, regardless of whether the VM is
+     * Java 6 or greater. If false, the driver will use MXBeans if the VM is Java 6 or greater, and use MBeans if
+     * the VM is Java 5.
+     * <p>
+     * Default is false.
+     * </p>
+     */
+    public boolean isAlwaysUseMBeans() {
+        return alwaysUseMBeans;
+    }
+
     private MongoClientOptions(final Builder builder) {
         description = builder.description;
         connectionsPerHost = builder.connectionsPerHost;
@@ -483,6 +518,7 @@ private MongoClientOptions(final Builder builder) {
         writeConcern = builder.writeConcern;
         socketFactory = builder.socketFactory;
         cursorFinalizerEnabled = builder.cursorFinalizerEnabled;
+        alwaysUseMBeans = builder.alwaysUseMBeans;
     }
 
 
@@ -501,4 +537,5 @@ private MongoClientOptions(final Builder builder) {
     private final WriteConcern writeConcern;
     private final SocketFactory socketFactory;
     private final boolean cursorFinalizerEnabled;
+    private final boolean alwaysUseMBeans;
 }

src/main/com/mongodb/MongoOptions.java

@@ -73,6 +73,7 @@ public void reset(){
         socketFactory = SocketFactory.getDefault();
         description = null;
         cursorFinalizerEnabled = true;
+        alwaysUseMBeans = false;
     }
 
     public MongoOptions copy() {
@@ -97,6 +98,7 @@ public MongoOptions copy() {
         m.socketFactory = socketFactory;
         m.description = description;
         m.cursorFinalizerEnabled = cursorFinalizerEnabled;
+        m.alwaysUseMBeans = alwaysUseMBeans;
         return m;
     }
 
@@ -336,6 +338,16 @@ public int hashCode() {
      */
     public WriteConcern writeConcern;
 
+    /**
+     * Sets whether JMX beans registered by the driver should always be MBeans, regardless of whether the VM is
+     * Java 6 or greater. If false, the driver will use MXBeans if the VM is Java 6 or greater, and use MBeans if
+     * the VM is Java 5.
+     * <p>
+     *     Default is false.
+     * </p>
+     */
+    public boolean alwaysUseMBeans;
+
     public String toString(){
         StringBuilder buf = new StringBuilder();
         buf.append( "description=" ).append( description ).append( ", " );
@@ -359,7 +371,8 @@ public String toString(){
         buf.append( "wtimeout=" ).append( wtimeout ).append( ", " );
         buf.append( "fsync=" ).append( fsync ).append( ", " );
         buf.append( "j=" ).append(j).append( ", " );
-        buf.append( "cursorFinalizerEnabled=").append( cursorFinalizerEnabled);
+        buf.append( "cursorFinalizerEnabled=").append(cursorFinalizerEnabled).append( ", " );
+        buf.append( "alwaysUseMBeans=").append(alwaysUseMBeans);
 
         return buf.toString();
     }
@@ -678,4 +691,20 @@ public void setCursorFinalizerEnabled(final boolean cursorFinalizerEnabled) {
         this.cursorFinalizerEnabled = cursorFinalizerEnabled;
 
     }
+
+    /**
+     *
+     * @return true if the driver should always use MBeans, regardless of VM
+     */
+    public boolean isAlwaysUseMBeans() {
+        return alwaysUseMBeans;
+    }
+
+    /**
+     *
+     * @param alwaysUseMBeans sets whether the driver should always use MBeans, regardless of VM
+     */
+    public void setAlwaysUseMBeans(final boolean alwaysUseMBeans) {
+        this.alwaysUseMBeans = alwaysUseMBeans;
+    }
 }

src/test/com/mongodb/MongoClientOptionsTest.java

@@ -41,6 +41,7 @@ public void testBuilderDefaults() {
         Assert.assertEquals(false, options.isSocketKeepAlive());
         Assert.assertEquals(true, options.isCursorFinalizerEnabled());
         Assert.assertEquals(false, options.isAutoConnectRetry());
+        Assert.assertEquals(false, options.isAlwaysUseMBeans());
     }
 
     @Test
@@ -117,6 +118,7 @@ public void testBuilderBuild() {
         builder.threadsAllowedToBlockForConnectionMultiplier(1);
         builder.socketKeepAlive(true);
         builder.cursorFinalizerEnabled(true);
+        builder.alwaysUseMBeans(true);
 
         SocketFactory socketFactory = SSLSocketFactory.getDefault();
         builder.socketFactory(socketFactory);
@@ -147,6 +149,7 @@ public DBDecoder create() {
         Assert.assertEquals(1, options.getThreadsAllowedToBlockForConnectionMultiplier());
         Assert.assertEquals(true, options.isSocketKeepAlive());
         Assert.assertEquals(true, options.isCursorFinalizerEnabled());
+        Assert.assertEquals(true, options.isAlwaysUseMBeans());
 
         Assert.assertEquals(socketFactory, options.getSocketFactory());
         Assert.assertEquals(encoderFactory, options.getDbEncoderFactory());

src/test/com/mongodb/MongoOptionsTest.java

@@ -51,6 +51,7 @@ public void testCopy() throws Exception {
         options.description = "cool";
         options.readPreference = ReadPreference.secondary();
         options.cursorFinalizerEnabled = true;
+        options.alwaysUseMBeans = true;
 
         final MongoOptions copy = options.copy();
         assertEquals(options.connectionsPerHost, copy.connectionsPerHost);
@@ -72,7 +73,7 @@ public void testCopy() throws Exception {
         assertEquals(options.socketFactory, copy.socketFactory);
         assertEquals(options.description, copy.description);
         assertEquals(options.readPreference, copy.readPreference);
-        assertEquals(options.cursorFinalizerEnabled, copy.cursorFinalizerEnabled);
+        assertEquals(options.alwaysUseMBeans, copy.alwaysUseMBeans);
     }
 
     @Test
@@ -99,6 +100,7 @@ public void testGetterSetters() throws Exception {
         options.setDescription("very cool");
         options.setReadPreference(ReadPreference.secondary());
         options.setCursorFinalizerEnabled(true);
+        options.setAlwaysUseMBeans(true);
 
         assertEquals(options.getConnectionsPerHost(), 100);
         assertEquals(options.getThreadsAllowedToBlockForConnectionMultiplier(), 101);
@@ -119,6 +121,7 @@ public void testGetterSetters() throws Exception {
         assertEquals(options.getDescription(), "very cool");
         assertEquals(options.getReadPreference(), ReadPreference.secondary());
         assertEquals(options.isCursorFinalizerEnabled(), true);
+        assertEquals(options.isAlwaysUseMBeans(), true);
     }
 
     @Test