JAVA-497: Use default ReadPreference for commands

jyemin · jyemin · commit 5804ac240ce1 · 2012-02-14T16:14:30.000-05:00
diff --git a/src/main/com/mongodb/DB.java b/src/main/com/mongodb/DB.java
@@ -180,7 +180,7 @@ public CommandResult command( DBObject cmd , int options, ReadPreference readPre
      */
     public CommandResult command( DBObject cmd , int options )
         throws MongoException {
-	return command(cmd, options, null);
+	return command(cmd, options, getReadPreference());
     }
     /**
      * Executes a database command.
diff --git a/src/test/com/mongodb/DBTests.java b/src/test/com/mongodb/DBTests.java
@@ -16,6 +16,7 @@
 
 package com.mongodb;
 
+import java.net.UnknownHostException;
 import java.util.*;
 
 import org.testng.annotations.Test;
@@ -109,4 +110,18 @@ public void testRenameAndDrop() throws MongoException {
         assertEquals( b.getName() , b2.getName() );
 
     }
+    
+    @Test
+    public void testCommandToSecondary() throws MongoException, UnknownHostException {
+        Mongo mongo = new Mongo(Arrays.asList(new ServerAddress("127.0.0.1"), new ServerAddress("127.0.0.1", 27018)));
+
+        if (isStandalone(mongo)) {
+            return;
+        }
+
+        DB db = mongo.getDB("secondaryTest");
+        db.setReadPreference(ReadPreference.SECONDARY);
+        CommandResult result = db.command("ping");
+        assertEquals("127.0.0.1:27018", result.get("serverUsed"));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public CommandResult command( DBObject cmd , int options, ReadPreference readPre`
`180`	`180`	`*/`
`181`	`181`	`public CommandResult command( DBObject cmd , int options )`
`182`	`182`	`throws MongoException {`
`183`		`- return command(cmd, options, null);`
	`183`	`+ return command(cmd, options, getReadPreference());`
`184`	`184`	`}`
`185`	`185`	`/**`
`186`	`186`	`* Executes a database command.`