JAVA-1287: Set WriteResult.updateOfExisting based only on BulkWriteResult.matchedCount

Author: jyemin

src/main/com/mongodb/DBCollectionImpl.java

@@ -323,10 +323,12 @@ private void addBulkWriteResultToCommandResult(final BulkWriteResult bulkWriteRe
            commandResult.put("n", bulkWriteResult.getRemovedCount());
         } else if (type == UPDATE || type == REPLACE) {
             commandResult.put("n", bulkWriteResult.getMatchedCount() + bulkWriteResult.getUpserts().size());
-            if (bulkWriteResult.getUpserts().isEmpty()) {
+            if (bulkWriteResult.getMatchedCount() > 0) {
                 commandResult.put("updatedExisting", true);
             } else {
                 commandResult.put("updatedExisting", false);
+            }
+            if (!bulkWriteResult.getUpserts().isEmpty()) {
                 commandResult.put("upserted", bulkWriteResult.getUpserts().get(0).getId());
             }
         }

src/test/com/mongodb/JavaClientTest.java

@@ -943,6 +943,15 @@ public void testWriteResultOnUpdate(){
         assertFalse(res.isLazy());
     }
 
+    @Test
+    public void testWriteResultOnUpdateWhenNoDocumentsMatch(){
+        WriteResult res = collection.update(new BasicDBObject("_id", 1), new BasicDBObject("$inc", new BasicDBObject("x", 1)));
+        assertEquals(0, res.getN());
+        assertFalse(res.isUpdateOfExisting());
+        assertNull(res.getUpsertedId());
+        assertFalse(res.isLazy());
+    }
+
     @Test
     public void testWriteResultOnUpsert(){
         ObjectId id = new ObjectId();