Fixed ClassCastException when commands with custom encoders fail.

Trisha Gee · Trisha Gee · commit b4c8de2e4be3 · 2013-08-26T11:16:27.000+02:00
diff --git a/driver/src/main/org/mongodb/CommandResult.java b/driver/src/main/org/mongodb/CommandResult.java
@@ -18,7 +18,7 @@
 
 import org.mongodb.connection.ServerAddress;
 
-public class CommandResult {
+public class CommandResult<T> {
     private final Document command;
     private final ServerAddress address;
     private final Document response;
@@ -31,7 +31,7 @@ public CommandResult(final Document command, final ServerAddress address, final
         this.elapsedNanoseconds = elapsedNanoseconds;
     }
 
-    public CommandResult(final CommandResult baseResult) {
+    public CommandResult(final CommandResult<T> baseResult) {
         this.command = baseResult.command;
         this.address = baseResult.address;
         this.response = baseResult.response;
@@ -55,7 +55,7 @@ public boolean isOk() {
     }
 
     public int getErrorCode() {
-        Integer errorCode = (Integer) getResponse().get("code");
+        final Integer errorCode = (Integer) getResponse().get("code");
         return (errorCode != null) ? errorCode : -1;
     }
 
diff --git a/driver/src/main/org/mongodb/Document.java b/driver/src/main/org/mongodb/Document.java
@@ -248,6 +248,8 @@ public int hashCode() {
      */
     @Override
     public String toString() {
+        //TODO: WARNING - this toString will not work if the Document contains any non-standard types,
+        // i.e. anything that requires a custom codec, like POJOs or custom CollectibleCodecs for generic Collections
         final StringWriter writer = new StringWriter();
         final BSONWriter bsonWriter = new JSONWriter(writer, new JSONWriterSettings(JSONMode.Strict));
         final Codec<Document> codec = new DocumentCodec(PrimitiveCodecs.createDefault());
diff --git a/driver/src/main/org/mongodb/command/MongoCommandFailureException.java b/driver/src/main/org/mongodb/command/MongoCommandFailureException.java
@@ -19,6 +19,8 @@
 import org.mongodb.CommandResult;
 import org.mongodb.operation.MongoServerException;
 
+import static java.lang.String.format;
+
 /**
  * Exception thrown when a command fails.
  */
@@ -28,8 +30,8 @@ public class MongoCommandFailureException extends MongoServerException {
     private final CommandResult commandResult;
 
     public MongoCommandFailureException(final CommandResult commandResult) {
-        super("Command failed with response " + commandResult.getResponse() + " on server " + commandResult.getAddress(),
-             commandResult.getAddress());
+        super(format("Command failed with error %s: '%s' on server %s", commandResult.getErrorCode(),
+                     commandResult.getErrorMessage(), commandResult.getAddress()), commandResult.getAddress());
         this.commandResult = commandResult;
     }
 
