- JAVA-387: DBCollection#findOne(DBObject o, DBObject fields) doesn't markAsPartialObject

Author: agirbal

src/main/com/mongodb/DBCollection.java

@@ -556,7 +556,11 @@ public final DBObject findOne( DBObject o )
      */
     public final DBObject findOne( DBObject o, DBObject fields ) {
         Iterator<DBObject> i = __find( o , fields , 0 , -1 , 0, getOptions() );
-        return i == null ? null : i.next();
+        DBObject obj = (i == null ? null : i.next());
+        if ( fields != null && fields.keySet().size() > 0 ){
+            obj.markAsPartialObject();
+        }
+        return obj;
     }
 
     /**

src/test/com/mongodb/JavaClientTest.java

@@ -289,6 +289,24 @@ public void testPartial1()
         assertEquals( 1 , out.get( "a" ) );
         assertNull( out.get( "b" ) );
 
+        // make sure can't insert back partial
+        try {
+            c.update(out, out);
+            assertTrue(false);
+        } catch (IllegalArgumentException ex) {
+        }
+
+        out = c.findOne( null , BasicDBObjectBuilder.start().add( "b" , 1 ).get() );
+        assertEquals( 2 , out.get( "b" ) );
+        assertNull( out.get( "a" ) );
+
+        // make sure can't insert back partial
+        try {
+            c.update(out, out);
+            assertTrue(false);
+        } catch (IllegalArgumentException ex) {
+        }
+
     }
 
     @Test