SERVER-30580 Eliminate UserException and MsgAssertionException types

All users were converted to just use AssertionException.

3 files changed, 4 insertions, 4 deletions

diff --git a/src/mongo/bson/bsonelement.h b/src/mongo/bson/bsonelement.h
index 6b605fffd71..7d58f4653aa 100644
--- a/src/mongo/bson/bsonelement.h
+++ b/src/mongo/bson/bsonelement.h
@@ -134,7 +134,7 @@ public:
         Note the returned object is a reference to within the parent bson object. If that
         object is out of scope, this pointer will no longer be valid. Call getOwned() on the
         returned BSONObj if you need your own copy.
-        throws UserException if the element is not of type object.
+        throws AssertionException if the element is not of type object.
     */
     BSONObj Obj() const;
 
diff --git a/src/mongo/bson/json.cpp b/src/mongo/bson/json.cpp
index 647accf31ba..5e132e1e5b3 100644
--- a/src/mongo/bson/json.cpp
+++ b/src/mongo/bson/json.cpp
@@ -1302,13 +1302,13 @@ BSONObj fromjson(const char* jsonString, int* len) {
     } catch (std::exception& e) {
         std::ostringstream message;
         message << "caught exception from within JSON parser: " << e.what();
-        throw MsgAssertionException(17031, message.str());
+        throw AssertionException(17031, message.str());
     }
 
     if (ret != Status::OK()) {
         ostringstream message;
         message << "code " << ret.code() << ": " << ret.codeString() << ": " << ret.reason();
-        throw MsgAssertionException(16619, message.str());
+        throw AssertionException(16619, message.str());
     }
     if (len)
         *len = jparse.offset();
diff --git a/src/mongo/bson/json.h b/src/mongo/bson/json.h
index 81bf78ace36..abc27f6daf6 100644
--- a/src/mongo/bson/json.h
+++ b/src/mongo/bson/json.h
@@ -45,7 +45,7 @@ namespace mongo {
  * quotes.  JSON unicode escape sequences (of the form \uXXXX) are
  * converted to utf8.
  *
- * @throws MsgAssertionException if parsing fails.  The message included with
+ * @throws AssertionException if parsing fails.  The message included with
  * this assertion includes the character offset where parsing failed.
  */
 BSONObj fromjson(const std::string& str);