JAVA-381: Partially reverted last change. The synchronization does have to be outside the null check, otherwise it's a race condition and the notification may never be received

Author: jyemin

src/main/com/mongodb/DynamicConnectionStatus.java

@@ -178,12 +178,10 @@ public CommandResult update() {
         private boolean isMongos;
     }
 
-    private ConnectionStatus getConnectionStatus() {
+    private synchronized ConnectionStatus getConnectionStatus() {
         if (connectionStatus == null) {
             try {
-                synchronized (this) {
-                    wait(_mongoOptions.connectTimeout);
-                }
+                wait(_mongoOptions.connectTimeout);
             } catch (InterruptedException e) {
                 throw new MongoException("Interrupted while waiting for next update to dynamic status", e);
             }