[JAVA-276]: findAndModify does not throw MongoException on error, fails silently

Author: agirbal

src/main/com/mongodb/DBCollection.java

@@ -319,8 +319,10 @@ public DBObject findAndModify(DBObject query, DBObject fields, DBObject sort, bo
 
         if (remove && !(update == null || update.keySet().isEmpty() || returnNew))
             throw new MongoException("FindAndModify: Remove cannot be mixed with the Update, or returnNew params!");
-        
-        return (DBObject) this._db.command( cmd ).get( "value" );
+
+        CommandResult res = this._db.command( cmd );
+        res.throwOnError();
+        return (DBObject) res.get( "value" );
     }
 
 

src/test/com/mongodb/JavaClientTest.java

@@ -681,7 +681,13 @@ public void testFindAndModify(){
         assertEquals( 2 , dbObj.keySet().size());
         assertEquals( 5 , dbObj.get( "x" ));
         assertNull( c.findOne(new BasicDBObject( "_id" , 1 ) ));
-        
+
+        // test exception throwing
+        try {
+            dbObj = c.findAndModify( null, null );
+            assertTrue(false, "Exception not throw when no update nor remove");
+        } catch (MongoException e) {
+        }
     }
 
     @Test