JAVA-1284: MongoTimeoutException should include the total time waited before timing out, not just the last time through the loop

Author: jyemin

src/main/com/mongodb/BaseCluster.java

@@ -85,7 +85,7 @@ public Server getServer(final ServerSelector serverSelector, final long maxWaitT
 
                 if (!currentPhase.await(timeout, NANOSECONDS)) {
                     throw new MongoTimeoutException(format("Timed out while waiting for a server that matches %s after %d ms",
-                                                           serverSelector, MILLISECONDS.convert(timeout, NANOSECONDS)));
+                                                           serverSelector, MILLISECONDS.convert(maxWaitTime, timeUnit)));
                 }
                 currentPhase = phase.get();
                 curDescription = description;
@@ -112,7 +112,7 @@ public ClusterDescription getDescription(final long maxWaitTime, final TimeUnit
 
                 if (!currentPhase.await(timeout, NANOSECONDS)) {
                     throw new MongoTimeoutException(format("Timed out while waiting to connect after %d ms",
-                                                           MILLISECONDS.convert(timeout, NANOSECONDS)));
+                                                           MILLISECONDS.convert(maxWaitTime, timeUnit)));
                 }
                 currentPhase = phase.get();
                 curDescription = description;