Move opReplicatedEnough call until after checking for errors

1 files changed, 3 insertions, 3 deletions

diff --git a/db/dbcommands.cpp b/db/dbcommands.cpp
index ee90d38ce65..b4b3d463ce4 100644
--- a/db/dbcommands.cpp
+++ b/db/dbcommands.cpp
@@ -156,9 +156,6 @@ namespace mongo {
                 while ( 1 ) {
                     OpTime op(c.getLastOp());
 
-                    if ( opReplicatedEnough( op, w ) )
-                        break;
-
                     // if replication isn't enabled (e.g., config servers)
                     if ( ! anyReplEnabled() ) {
                         errmsg = "replication not enabled";
@@ -171,6 +168,9 @@ namespace mongo {
                         return true;
                     }
 
+                    if ( opReplicatedEnough( op, w ) )
+                        break;
+
                     if ( timeout > 0 && t.millis() >= timeout ) {
                         result.append( "wtimeout" , true );
                         errmsg = "timed out waiting for slaves";