fix $ne/$nin on non-matches SERVER-198

2 files changed, 5 insertions, 3 deletions

diff --git a/db/matcher.cpp b/db/matcher.cpp
index 27faa45432d..9bde6b7a655 100644
--- a/db/matcher.cpp
+++ b/db/matcher.cpp
@@ -336,7 +336,9 @@ namespace mongo {
 
     int JSMatcher::matchesNe(const char *fieldName, const BSONElement &toMatch, const BSONObj &obj, const BasicMatcher& bm, bool *deep) {
         int ret = matchesDotted( fieldName, toMatch, obj, BSONObj::Equality, bm, deep );
-        return -ret;
+        if ( ret <= 0 )
+            return 1;
+        return 0;
     }
     
     /* Check if a particular field matches.
diff --git a/jstests/not1.js b/jstests/not1.js
index 42aa3fb2e66..f99a8490170 100644
--- a/jstests/not1.js
+++ b/jstests/not1.js
@@ -10,9 +10,9 @@ t.insert({})
 function test( name ){
     assert.eq( 3 , t.find().count() , name + "A" );
     assert.eq( 1 , t.find( { a : 1 } ).count() , name + "B" );
-    //assert.eq( 2 , t.find( { a : { $ne : 1 } } ).count() , name + "C" );  // SERVER-198
+    assert.eq( 2 , t.find( { a : { $ne : 1 } } ).count() , name + "C" );  // SERVER-198
     assert.eq( 1 , t.find({a:{$in:[1]}}).count()  , name + "D" );
-    //assert.eq( 2 , t.find({a:{$nin:[1]}}).count() , name + "E" ); // SERVER-198
+    assert.eq( 2 , t.find({a:{$nin:[1]}}).count() , name + "E" ); // SERVER-198
 }
 
 test( "no index" );