use CommandResult for WriteResult

erh · erh · commit f8f032dc88b3 · 2010-06-25T23:36:57.000-04:00
diff --git a/src/main/com/mongodb/DBPort.java b/src/main/com/mongodb/DBPort.java
@@ -88,22 +88,22 @@ private synchronized Response go( OutMessage msg , DBCollection coll )
         }
     }
 
-    synchronized BasicDBObject getLastError( DB db ){
+    synchronized CommandResult getLastError( DB db ){
 
         OutMessage msg = OutMessage.query( 0 , db.getName() + ".$cmd" , 0 , -1 , new BasicDBObject( "getlasterror" , 1 ) , null );
         
         try {
             Response res = go( msg , db.getCollection( "$cmd" ) );
             if ( res.size() != 1 )
                 throw new MongoInternalException( "something is wrong.  size:" + res.size() );
-            return (BasicDBObject)res.get(0);
+            return (CommandResult)res.get(0);
         }
         catch ( IOException ioe ){
             throw new MongoInternalException( "getlasterror failed: " + ioe.toString() , ioe );
         }
     }
     
-    synchronized BasicDBObject tryGetLastError( DB db , long last ){
+    synchronized CommandResult tryGetLastError( DB db , long last ){
         if ( last != _calls )
             return null;
         
diff --git a/src/main/com/mongodb/DBTCPConnector.java b/src/main/com/mongodb/DBTCPConnector.java
@@ -113,12 +113,12 @@ public void requestEnsureConnection(){
     WriteResult _checkWriteError( MyPort mp , DBPort port )
         throws MongoException {
 
-        DBObject e = _mongo.getDB( "admin" ).getLastError();
+        CommandResult e = _mongo.getDB( "admin" ).getLastError();
         mp.done( port );
         
         Object foo = e.get( "err" );
         if ( foo == null )
-            return new WriteResult( (BasicDBObject)e );
+            return new WriteResult( e );
         
         int code = -1;
         if ( e.get( "code" ) instanceof Number )
@@ -150,8 +150,12 @@ public WriteResult say( DB db , OutMessage m , DB.WriteConcern concern )
         catch ( IOException ioe ){
             mp.error( ioe );
             _error( ioe );
-            if ( concern == DB.WriteConcern.NONE )
-                return new WriteResult( new BasicDBObject( "$err" , "NETWORK ERROR" ) );
+            if ( concern == DB.WriteConcern.NONE ){
+                CommandResult res = new CommandResult();
+                res.put( "ok" , false );
+                res.put( "$err" , "NETWORK ERROR" );
+                return new WriteResult( res );
+            }
             throw new MongoException.Network( "can't say something" , ioe );
         }
         catch ( MongoException me ){
diff --git a/src/main/com/mongodb/WriteResult.java b/src/main/com/mongodb/WriteResult.java
@@ -28,7 +28,7 @@
  */
 public class WriteResult {
     
-    WriteResult( BasicDBObject o ){
+    WriteResult( CommandResult o ){
         _lastErrorResult = o;
         _lazy = false;
     }
@@ -40,7 +40,7 @@ public class WriteResult {
         _lazy = true;
     }
     
-    public synchronized BasicDBObject getLastError(){
+    public synchronized CommandResult getLastError(){
         if ( _lastErrorResult != null )
             return _lastErrorResult;
         
@@ -84,7 +84,7 @@ public String toString(){
     DBPort _port;
     long _lastCall;
 
-    BasicDBObject _lastErrorResult;
+    CommandResult _lastErrorResult;
 
     final boolean _lazy;
 }

Original file line number	Diff line number	Diff line change
`@@ -88,22 +88,22 @@ private synchronized Response go( OutMessage msg , DBCollection coll )`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`91`		`- synchronized BasicDBObject getLastError( DB db ){`
	`91`	`+ synchronized CommandResult getLastError( DB db ){`
`92`	`92`
`93`	`93`	`OutMessage msg = OutMessage.query( 0 , db.getName() + ".$cmd" , 0 , -1 , new BasicDBObject( "getlasterror" , 1 ) , null );`
`94`	`94`
`95`	`95`	`try {`
`96`	`96`	`Response res = go( msg , db.getCollection( "$cmd" ) );`
`97`	`97`	`if ( res.size() != 1 )`
`98`	`98`	`throw new MongoInternalException( "something is wrong. size:" + res.size() );`
`99`		`- return (BasicDBObject)res.get(0);`
	`99`	`+ return (CommandResult)res.get(0);`
`100`	`100`	`}`
`101`	`101`	`catch ( IOException ioe ){`
`102`	`102`	`throw new MongoInternalException( "getlasterror failed: " + ioe.toString() , ioe );`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`		`- synchronized BasicDBObject tryGetLastError( DB db , long last ){`
	`106`	`+ synchronized CommandResult tryGetLastError( DB db , long last ){`
`107`	`107`	`if ( last != _calls )`
`108`	`108`	`return null;`
`109`	`109`