[JAVA-292] fixes WriteResult.getLastError().throwOnError()

Author: scotthernandez

src/main/com/mongodb/CommandResult.java

@@ -60,22 +60,59 @@ public String getErrorMessage(){
      * @return
      */
     public MongoException getException(){
-        String cmdName = _cmd.keySet().iterator().next();
+        if ( !ok() ) {
+            String cmdName = _cmd.keySet().iterator().next();
 
-        StringBuilder buf = new StringBuilder( "command failed [" );
-        buf.append( "command failed [" ).append( cmdName ).append( "] " );
-        buf.append( toString() );
+            StringBuilder buf = new StringBuilder( "command failed [" );
+            buf.append( "command failed [" ).append( cmdName ).append( "] " );
+            buf.append( toString() );
+
+            return new CommandFailure( this , buf.toString() );
+        } else {
+            // GLE check
+            if ( hasErr() ) {
+                Object foo = get( "err" );
+
+                int code = getCode();
+
+                String s = foo.toString();
+                if ( code == 11000 || code == 11001 || s.startsWith( "E11000" ) || s.startsWith( "E11001" ) )
+                    return new MongoException.DuplicateKey( code , s );
+
+                return new MongoException( code , s );
+            }
+        }
 
-        return new CommandFailure( this , buf.toString() );
+        //all good, should never get here.
+        return  null;
+    }
+ 
+    /**
+     * returns the "code" field, as an int
+     * @return -1 if there is no code
+     */
+    private int getCode(){
+        int code = -1;
+        if ( get( "code" ) instanceof Number )
+            code = ((Number)get("code")).intValue();
+        return code;
+    }
+
+    /**
+     * check the "err" field
+     * @return if it has it, and isn't null
+     */
+    boolean hasErr(){
+        Object o = get( "err" );
+        return (o != null && ( (String) o ).length() > 0 );
     }
 
     /**
-     * throws an exception containing the cmd name, in case the command failed
+     * throws an exception containing the cmd name, in case the command failed, or the "err/code" information
      * @throws MongoException
      */
-    public void throwOnError()
-        throws MongoException {
-        if ( ! ok() ){
+    public void throwOnError() throws MongoException {
+        if ( !ok() || hasErr() ){
             throw getException();
         }
     }

src/main/com/mongodb/DBTCPConnector.java

@@ -18,12 +18,10 @@
 
 package com.mongodb;
 
-import java.io.*;
-import java.net.*;
+import java.io.IOException;
 import java.util.*;
-import java.util.logging.*;
-
-import org.bson.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class DBTCPConnector implements DBConnector {
 
@@ -120,20 +118,12 @@ WriteResult _checkWriteError( DB db , MyPort mp , DBPort port , WriteConcern con
         throws MongoException, IOException {
         CommandResult e = null;
         e = port.runCommand( db , concern.getCommand() );
-        
-        Object foo = e.get( "err" );
-        if ( foo == null )
+
+        if ( ! e.hasErr() )
             return new WriteResult( e , concern );
 
-        int code = -1;
-        if ( e.get( "code" ) instanceof Number )
-            code = ((Number)e.get("code")).intValue();
-        String s = foo.toString();
-        if ( code == 11000 || code == 11001 ||
-             s.startsWith( "E11000" ) ||
-             s.startsWith( "E11001" ) )
-            throw new MongoException.DuplicateKey( code , s );
-        throw new MongoException( code , s );
+        e.throwOnError();
+        return null;
     }
 
     public WriteResult say( DB db , OutMessage m , WriteConcern concern )

src/test/com/mongodb/DBCursorTest.java

@@ -16,12 +16,12 @@
 
 package com.mongodb;
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.util.Iterator;
 
 import org.testng.annotations.Test;
 
-import com.mongodb.util.*;
+import com.mongodb.util.TestCase;
 
 public class DBCursorTest extends TestCase {
 
@@ -226,6 +226,14 @@ public void testSpecial(){
 
     }
 
+//    @Test
+//    public void testFullRangeCursorIdsOnClose(){
+//        DBCollection c = _db.getCollection( "testCursorIds" );
+//        c.insert( new BasicDBObject( "x" , 1 ) );
+//        
+//        DBCursor curr
+//
+//    }
     @Test
     public void testLimitAndBatchSize() {
         DBCollection c = _db.getCollection( "LimitAndBatchSize" );