assign error codes

mdietz198 · Dec 12, 2011 · 4362ed1 · 4362ed1
1 parent 4ef6e17
commit 4362ed1
Show file tree

Hide file tree

Showing 2 changed files with 643 additions and 604 deletions.
diff --git a/db/commands/pipeline.cpp b/db/commands/pipeline.cpp
@@ -140,9 +140,9 @@ namespace mongo {
         for(size_t iStep = 0; iStep < nSteps; ++iStep) {
             /* pull out the pipeline element as an object */
             BSONElement pipeElement(pipeline[iStep]);
-	    if (pipeElement.type() != Object) {
-		assert(pipeElement.type() == Object); // CW TODO user error
-	    }
+	    uassert(15942, str::stream() << "pipeline element " <<
+		    iStep << " is not an object",
+		    pipeElement.type() == Object);
             BSONObj bsonObj(pipeElement.Obj());
 
 	    intrusive_ptr<DocumentSource> pSource;