merged.

Author: Ryan

src/test/com/mongodb/SecondaryReadTest.java

@@ -184,6 +184,8 @@ public void testSecondaryReadCursor() throws Exception {
 
             final DBCursor cur = col.find();
 
+            cur.hasNext();
+
             ServerAddress curServerAddress = cur.getServerAddress();
 
             assertEquals(true, serverIsSecondary(curServerAddress, testHosts));
@@ -206,6 +208,9 @@ private boolean serverIsSecondary(final ServerAddress pServerAddr, final List<Te
             final int portIdx = h.hostnameAndPort.indexOf(":");
             final int port = Integer.parseInt(h.hostnameAndPort.substring(portIdx+1, h.hostnameAndPort.length()));
             final String hostname = h.hostnameAndPort.substring(0, portIdx);
+
+            //System.out.println("---- hostname: " + hostname + " + server addr host: " + pServerAddr.getHost());
+
             if (pServerAddr.getPort() == port && hostname.equals(pServerAddr.getHost())) return true;
         }
 
@@ -263,9 +268,7 @@ private List<ObjectId> insertTestData(final DBCollection pCol) throws Exception
         // Insert some test data.
         for (int idx=0; idx < INSERT_COUNT; idx++) {
             final ObjectId id = ObjectId.get();
-            System.err.println("Inserting ID " + id + " with REPLICAS_SAFE");
             WriteResult writeResult = pCol.insert(new BasicDBObject("_id", id), WriteConcern.REPLICAS_SAFE);
-            System.err.println("Inserted OK.");
             writeResult.getLastError().throwOnError();
             insertedIds.add(id);
         }