Fixes JAVA-411, findOne fails when fields are specified but no document is found ( NullPointerException )

Brendan W. McAdams · Brendan W. McAdams · commit 2894ab4fc761 · 2011-08-09T14:23:14.000-04:00
* Test for nullness on DBObject prior to setting PartialObject when fields are set
diff --git a/src/main/com/mongodb/DBCollection.java b/src/main/com/mongodb/DBCollection.java
@@ -564,7 +564,7 @@ public final DBObject findOne( DBObject o )
     public final DBObject findOne( DBObject o, DBObject fields ) {
         Iterator<DBObject> i = __find( o , fields , 0 , -1 , 0, getOptions() );
         DBObject obj = (i == null ? null : i.next());
-        if ( fields != null && fields.keySet().size() > 0 ){
+        if ( obj != null && ( fields != null && fields.keySet().size() > 0 ) ){
             obj.markAsPartialObject();
         }
         return obj;

Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ public final DBObject findOne( DBObject o )`
`564`	`564`	`public final DBObject findOne( DBObject o, DBObject fields ) {`
`565`	`565`	`Iterator<DBObject> i = __find( o , fields , 0 , -1 , 0, getOptions() );`
`566`	`566`	`DBObject obj = (i == null ? null : i.next());`
`567`		`- if ( fields != null && fields.keySet().size() > 0 ){`
	`567`	`+ if ( obj != null && ( fields != null && fields.keySet().size() > 0 ) ){`
`568`	`568`	`obj.markAsPartialObject();`
`569`	`569`	`}`
`570`	`570`	`return obj;`