fixed a bug due to improper ordering of instanceof conditionals. Since CodeWScope extends Code, it has to be checked before Code

Author: jyemin

driver-compat/src/main/com/mongodb/Bytes.java

@@ -233,16 +233,15 @@ public static byte getType(final Object o) {
             return OBJECT;
         }
 
-        if (o instanceof Code) {
-            return CODE;
-        }
-
         if (o instanceof CodeWScope) {
             return CODE_W_SCOPE;
         }
 
+        if (o instanceof Code) {
+            return CODE;
+        }
+
         return -1;
     }
 
-    static final ObjectId COLLECTION_REF_ID = new ObjectId(-1, -1, -1);
 }

driver/src/test/org/mongodb/MongoCursorTest.java

@@ -40,6 +40,14 @@ public void setUp() {
         }
     }
 
+    @After
+    public void tearDown() {
+        super.tearDown();
+        if (cursor != null) {
+            cursor.close();
+        }
+    }
+
     @Test
     public void testNormalLoopWithGetMore() {
         cursor = collection.sort(new SortCriteriaDocument("_id", 1)).batchSize(2).all();
@@ -92,11 +100,4 @@ public void shouldNotBeAbleToCallHasNextAfterClose() {
         cursor.close();
             cursor.hasNext();
     }
-
-    @After
-    public void tearDown() {
-        if (cursor != null) {
-            cursor.close();
-        }
-    }
 }

driver/src/test/org/mongodb/MongoSaveTest.java

@@ -17,6 +17,7 @@
 package org.mongodb;
 
 import org.bson.types.Document;
+import org.bson.types.ObjectId;
 import org.junit.Test;
 
 import static org.hamcrest.core.Is.is;
@@ -45,4 +46,15 @@ public void shouldUpsertIfAbsent() {
         collection.save(document);
         assertThat("Did not upsert the document", collection.one(), is(document));
     }
+
+    @Test
+    public void shouldUpsertWithNewObjectId() {
+        final Document document = new Document("_id", new ObjectId()).append("x", 1);
+        collection.save(document);
+        assertThat("Did not replace the document", collection.one(), is(document));
+
+        document.put("y", 2);
+        collection.save(document);
+        assertThat("Did not replace the document", collection.one(), is(document));
+    }
 }