SERVER-30580 Make DBException hold a Status

1 files changed, 6 insertions, 6 deletions

diff --git a/src/mongo/db/curop.cpp b/src/mongo/db/curop.cpp
index 9026b2835c4..49dd733dd44 100644
--- a/src/mongo/db/curop.cpp
+++ b/src/mongo/db/curop.cpp
@@ -507,10 +507,9 @@ string OpDebug::report(Client* client,
         s << " writeConflicts:" << writeConflicts;
     }
 
-    if (!exceptionInfo.empty()) {
-        s << " exception: " << redact(exceptionInfo.msg);
-        if (exceptionInfo.code)
-            s << " code:" << exceptionInfo.code;
+    if (!exceptionInfo.isOK()) {
+        s << " exception: " << redact(exceptionInfo.reason());
+        s << " code:" << exceptionInfo.code();
     }
 
     s << " numYields:" << curop.numYields();
@@ -605,8 +604,9 @@ void OpDebug::append(const CurOp& curop,
         lockStats.report(&locks);
     }
 
-    if (!exceptionInfo.empty()) {
-        exceptionInfo.append(b, "exception", "exceptionCode");
+    if (!exceptionInfo.isOK()) {
+        b.append("exception", exceptionInfo.reason());
+        b.append("exceptionCode", exceptionInfo.code());
     }
 
     OPDEBUG_APPEND_NUMBER(nreturned);