Merge commit 'upstream/1.8.1'

1 files changed, 2 insertions, 6 deletions

diff --git a/s/commands_public.cpp b/s/commands_public.cpp
index 02000a0..5b1ecaf 100644
--- a/s/commands_public.cpp
+++ b/s/commands_public.cpp
@@ -545,12 +545,8 @@ namespace mongo {
                 bool ok = conn->runCommand( conf->getName() , cmdObj , res );
                 conn.done();
 
-                if (ok || (strcmp(res["errmsg"].valuestrsafe(), "No matching object found") != 0)) {
-                    result.appendElements(res);
-                    return ok;
-                }
-
-                return true;
+                result.appendElements(res);
+                return ok;
             }
 
         } findAndModifyCmd;