SERVER-11136 SERVER-11135 support NumberLong() in BSONElement::jsonString() result

2 files changed, 3 insertions, 8 deletions

diff --git a/src/mongo/db/jsobj.cpp b/src/mongo/db/jsobj.cpp
index bee99426f9a..3d75d4d47e8 100644
--- a/src/mongo/db/jsobj.cpp
+++ b/src/mongo/db/jsobj.cpp
@@ -78,13 +78,12 @@ namespace mongo {
             s << '"' << escape( string(valuestr(), valuestrsize()-1) ) << '"';
             break;
         case NumberLong:
-/* TODO: Enable when SERVER-11135 fixed
-               if(format == JS) {
+            if (format == JS) {
                 s << "NumberLong(" << _numberLong() << ")";
             }
-            else
-*/
+            else {
                 s << _numberLong();
+            }
             break;
         case NumberInt:
             if(format == JS) {
diff --git a/src/mongo/dbtests/jsontests.cpp b/src/mongo/dbtests/jsontests.cpp
index 27e21f38cbf..37b8ee46054 100644
--- a/src/mongo/dbtests/jsontests.cpp
+++ b/src/mongo/dbtests/jsontests.cpp
@@ -2303,13 +2303,9 @@ namespace JsonTests {
 
         class NumericLongMin : public Base {
             virtual BSONObj bson() const {
-/* TODO: Enable when SERVER-11135 fixed
                 BSONObjBuilder b;
                 b.appendNumber("a", std::numeric_limits<long long>::min());
                 return b.obj();
-*/
-                return BSON("a" << std::numeric_limits<long long>::min());
-
             }
             virtual string json() const {
                 std::stringstream ss;