JAVA-467: cur.toString() should not block

agirbal · agirbal · commit 45b2dd89505f · 2011-12-12T13:55:00.000-08:00
diff --git a/src/main/com/mongodb/DBCursor.java b/src/main/com/mongodb/DBCursor.java
@@ -673,13 +673,10 @@ public DBCollection getCollection(){
 
     /**
      * Gets the Server Address of the server that data is pulled from.
-     * Note that this information is not available if no data has been retrieved yet.
-     * Availability is specific to underlying implementation and may vary.
+     * Note that this information may not be available until hasNext() or next() is called.
      * @return
      */
     public ServerAddress getServerAddress() {
-        _check();
-
         if (_it != null && _it instanceof DBApiLayer.Result)
             return ((DBApiLayer.Result)_it).getServerAddress();
 
diff --git a/src/test/com/mongodb/DBCursorTest.java b/src/test/com/mongodb/DBCursorTest.java
@@ -63,6 +63,7 @@ public void testGetServerAddressQuery() {
         for (int i=0; i < 10; i++) c.insert(new BasicDBObject("one", "two"));
 
         final DBCursor cur = c.find();
+        cur.hasNext();
         assertNotNull(cur.getServerAddress());
     }
 
@@ -76,6 +77,7 @@ public void testGetServerAddressQuery1() {
         for (int i=0; i < 10; i++) c.insert(new BasicDBObject("one", i));
 
         final DBCursor cur = c.find(new BasicDBObject("one", 9));
+        cur.hasNext();
         assertNotNull(cur.getServerAddress());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ public void testGetServerAddressQuery() {`
`63`	`63`	`for (int i=0; i < 10; i++) c.insert(new BasicDBObject("one", "two"));`
`64`	`64`
`65`	`65`	`final DBCursor cur = c.find();`
	`66`	`+ cur.hasNext();`
`66`	`67`	`assertNotNull(cur.getServerAddress());`
`67`	`68`	`}`
`68`	`69`
`@@ -76,6 +77,7 @@ public void testGetServerAddressQuery1() {`
`76`	`77`	`for (int i=0; i < 10; i++) c.insert(new BasicDBObject("one", i));`
`77`	`78`
`78`	`79`	`final DBCursor cur = c.find(new BasicDBObject("one", 9));`
	`80`	`+ cur.hasNext();`
`79`	`81`	`assertNotNull(cur.getServerAddress());`
`80`	`82`	`}`
`81`	`83`