SERVER-10026 use massert instead of verify to fix debug build

2 files changed, 5 insertions, 10 deletions

diff --git a/src/mongo/db/matcher/matcher.cpp b/src/mongo/db/matcher/matcher.cpp
index 2cc150cf4ae..8cb4a0b4286 100644
--- a/src/mongo/db/matcher/matcher.cpp
+++ b/src/mongo/db/matcher/matcher.cpp
@@ -122,8 +122,9 @@ namespace mongo {
                 }
             }
 
-            // This is bad.
-            verify(0);
+            // This should not happen.
+            massert(16920, "trying to match on unknown field: " + path.fieldRef().dottedField(),
+                    0);
 
             return new SingleElementElementIterator(BSONElement());
         }
diff --git a/src/mongo/dbtests/query_stage_tests.cpp b/src/mongo/dbtests/query_stage_tests.cpp
index 876d122fa98..e8c8d90e2c2 100644
--- a/src/mongo/dbtests/query_stage_tests.cpp
+++ b/src/mongo/dbtests/query_stage_tests.cpp
@@ -181,14 +181,8 @@ namespace QueryStageTests {
             params.endKeyInclusive = true;
             params.direction = 1;
 
-            bool threw = false;
-            try {
-                countResults(params, new Matcher(BSON("baz" << 25)));
-            } catch(...) {
-                threw = true;
-            }
-
-            ASSERT_TRUE(threw);
+            ASSERT_THROWS(countResults(params, new Matcher(BSON("baz" << 25))),
+                          MsgAssertionException);
         }
     };