Handling command responses that are missing "ok" and/or "errmsg" fields.

   JAVA-1811

Author: jyemin

driver-core/src/main/com/mongodb/MongoCommandException.java

@@ -85,18 +85,10 @@ private static String getResponseAsJson(final BsonDocument commandResponse) {
     }
 
     private static int extractErrorCode(final BsonDocument response) {
-        if (response.containsKey("code")) {
-            return ((BsonInt32) response.get("code")).getValue();
-        } else {
-            return -1;
-        }
+        return response.getNumber("code", new BsonInt32(-1)).intValue();
     }
 
     private static String extractErrorMessage(final BsonDocument response) {
-        if (response.containsKey("errmsg")) {
-            return ((BsonString) response.get("errmsg")).getValue();
-        } else {
-            return null;
-        }
+        return response.getString("errmsg", new BsonString("")).getValue();
     }
 }

driver-core/src/main/com/mongodb/connection/ProtocolHelper.java

@@ -58,7 +58,9 @@ private static WriteConcernResult createWriteResult(final BsonDocument result) {
 
     static boolean isCommandOk(final BsonDocument response) {
         BsonValue okValue = response.get("ok");
-        if (okValue.isBoolean()) {
+        if (okValue == null) {
+            return false;
+        } else if (okValue.isBoolean()) {
             return okValue.asBoolean().getValue();
         } else if (okValue.isNumber()) {
             return okValue.asNumber().intValue() == 1;

driver-core/src/test/unit/com/mongodb/MongoCommandExceptionSpecification.groovy

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import org.bson.BsonBoolean
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonString
+import spock.lang.Specification
+
+class MongoCommandExceptionSpecification extends Specification {
+
+    def 'should extract error message'() {
+        expect:
+        new MongoCommandException(new BsonDocument('ok', BsonBoolean.FALSE).append('errmsg', new BsonString('the error message')),
+                                  new ServerAddress())
+                .getErrorMessage() == 'the error message'
+        new MongoCommandException(new BsonDocument('ok', BsonBoolean.FALSE),
+                                  new ServerAddress())
+                .getErrorMessage() == ''
+    }
+
+    def 'should extract error code'() {
+        expect:
+        new MongoCommandException(new BsonDocument('ok', BsonBoolean.FALSE).append('code', new BsonInt32(26)),
+                                  new ServerAddress())
+                .getErrorCode() == 26
+        new MongoCommandException(new BsonDocument('ok', BsonBoolean.FALSE),
+                                  new ServerAddress())
+                .getErrorCode() == -1
+    }
+
+}

driver-core/src/test/unit/com/mongodb/connection/ProtocolHelperSpecification.groovy

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014-2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.mongodb.connection
 
 import com.mongodb.MongoCommandException
@@ -25,6 +41,11 @@ import static com.mongodb.connection.ProtocolHelper.isCommandOk
 
 class ProtocolHelperSpecification extends Specification {
 
+    def 'isCommandOk should be false if ok field is missing'() {
+        expect:
+        !isCommandOk(new BsonDocument())
+    }
+
     def 'isCommandOk should be false for numbers that are 0'() {
         expect:
         !isCommandOk(new BsonDocument('ok', new BsonInt32(0)))
@@ -158,4 +179,4 @@ class ProtocolHelperSpecification extends Specification {
         then:
         thrown(WriteConcernException)
     }
-}
+}