JAVA-649: Using connectTimeout from MongoOptions of the Mongo instance for all the timeouts in ReplicaSetStatus, MongosStatus, and DynamicConnectionStagtus

Author: jyemin

src/main/com/mongodb/DynamicConnectionStatus.java

@@ -181,7 +181,7 @@ public CommandResult update() {
     private synchronized ConnectionStatus getConnectionStatus() {
         if (connectionStatus == null) {
             try {
-                wait(_mongoOptions.connectTimeout);
+                wait(_mongo.getMongoOptions().getConnectTimeout());
             } catch (InterruptedException e) {
                 throw new MongoInterruptedException("Interrupted while waiting for next update to dynamic status", e);
             }

src/main/com/mongodb/MongosStatus.java

@@ -119,7 +119,7 @@ private synchronized Node getPreferred() {
         if (preferred == null) {
             try {
                 synchronized (this) {
-                    wait();
+                    wait(_mongo.getMongoOptions().getConnectTimeout());
                 }
             } catch (InterruptedException e) {
                 throw new MongoInterruptedException("Interrupted while waiting for next update to mongos status", e);

src/main/com/mongodb/ReplicaSetStatus.java

@@ -124,41 +124,39 @@ boolean hasServerUp() {
     // Simple abstraction over a volatile ReplicaSet reference that starts as null.  The get method blocks until members
     // is not null. The set method notifies all, thus waking up all getters.
     @ThreadSafe
-    static class ReplicaSetHolder {
-       private volatile ReplicaSet members;
-
-       // blocks until replica set is set, or a timeout occurs
-       synchronized ReplicaSet get() {
-           while (members == null) {
-               try {
-                   wait(ReplicaSetStatus.mongoOptionsDefaults.socketTimeout);
-               }
-               catch (InterruptedException e) {
-                   throw new MongoInterruptedException("Interrupted while waiting for next update to replica set status", e);
-               }
-           }
-           return members;
-       }
-
-       // set the replica set to a non-null value and notifies all threads waiting.
-       synchronized void set(ReplicaSet members) {
-           if (members == null) {
-               throw new IllegalArgumentException("members can not be null");
-           }
-           
-           this.members = members;
-           notifyAll();
-       }
-
-       // blocks until the replica set is set again
-       synchronized void waitForNextUpdate() {
-           try {
-               wait(ReplicaSetStatus.mongoOptionsDefaults.socketTimeout);
-           }
-           catch (InterruptedException e) {
-              throw new MongoInterruptedException("Interrupted while waiting for next update to replica set status", e);
-           }
-       }
+    class ReplicaSetHolder {
+        private volatile ReplicaSet members;
+
+        // blocks until replica set is set, or a timeout occurs
+        synchronized ReplicaSet get() {
+            while (members == null) {
+                try {
+                    wait(_mongo.getMongoOptions().getConnectTimeout());
+                } catch (InterruptedException e) {
+                    throw new MongoInterruptedException("Interrupted while waiting for next update to replica set status", e);
+                }
+            }
+            return members;
+        }
+
+        // set the replica set to a non-null value and notifies all threads waiting.
+        synchronized void set(ReplicaSet members) {
+            if (members == null) {
+                throw new IllegalArgumentException("members can not be null");
+            }
+
+            this.members = members;
+            notifyAll();
+        }
+
+        // blocks until the replica set is set again
+        synchronized void waitForNextUpdate() {
+            try {
+                wait(_mongo.getMongoOptions().getConnectTimeout());
+            } catch (InterruptedException e) {
+                throw new MongoInterruptedException("Interrupted while waiting for next update to replica set status", e);
+            }
+        }
 
         public synchronized void close() {
             this.members = null;