CXX-498 make OperationException inherit from DBException

Author: amidvidy

src/mongo/client/exceptions.cpp

@@ -22,15 +22,11 @@ namespace mongo {
     }
 
     OperationException::OperationException(const BSONObj& errorObj)
-        : _lastError(errorObj)
-        , _errorString(std::string(kName) + ": " + errorObj.toString())
+        : DBException(std::string(kName) + ": " + errorObj.toString(), 0)
+        , _lastError(errorObj)
     {}
 
     OperationException::~OperationException() throw() {
     }
 
-    const char* OperationException::what() const throw() {
-        return _errorString.c_str();
-    }
-
 } // namespace mongo

src/mongo/client/exceptions.h

@@ -19,23 +19,21 @@
 #include <string>
 
 #include "mongo/db/jsobj.h"
+#include "mongo/util/assert_util.h"
 
 namespace mongo {
 
     /**
      * General runtime exception generated by the MongoDB client driver.
      */
-    class MONGO_CLIENT_API OperationException : public std::exception {
+    class MONGO_CLIENT_API OperationException : public DBException {
     public:
         /** Takes a BSONObj that is the result of the "getlasterror" command */
         OperationException(const BSONObj& errorObj);
 
         /** Required due to BSONObj member desctructor not specifying throw() */
         virtual ~OperationException() throw();
 
-        /** The string version of the getlasterror result passed to constructor */
-        virtual const char* what() const throw();
-
         /** Get the last_error object representing the operation exception */
         const BSONObj& obj() const { return _lastError; }
 

src/mongo/integration/replica_set/basic.cpp

@@ -54,7 +54,7 @@ namespace {
             try {
                 conn->insert(TEST_NS, BSON("x" << 2), 0, &WriteConcern::acknowledged);
                 break;
-            } catch (DBException&) {
+            } catch (const DBException&) {
                 mongo::sleepsecs(1);
             }
         }
@@ -69,10 +69,9 @@ namespace {
                 conn->insert(TEST_NS, BSON("x" << 2), 0, &wcAll);
                 break;
 
-            } catch (OperationException&) {
-                // try again
-            } catch (std::exception&) {
+            } catch (const DBException&) {
                 // try again
+                mongo::sleepsecs(1);
             }
         }
     }

src/mongo/integration/replica_set/read_preference.cpp

@@ -164,7 +164,7 @@ namespace {
             try {
                 replset_conn->findOne(TEST_NS, Query().readPref(ReadPreference_SecondaryOnly, BSONArray()));
                 break;
-            } catch (DBException& ex) {
+            } catch (const DBException& ex) {
                 std::cout << ex.what() <<std::endl;
                 mongo::sleepsecs(1);
             }