Small fix to make each work better with tailable cursors

Author: christkv

lib/cursor.js

@@ -633,6 +633,7 @@ var nextObject = function(self, callback) {
       return handleCallback(callback, err);
     }
   }
+
   // Get the next object
   self._next(function(err, doc) {
     if(err && err.tailable && self.s.currentNumberOfRetries == 0) return callback(err);
@@ -716,7 +717,7 @@ var _each = function(self, callback) {
     while(fn = loop(self, callback)) fn(self, callback);
     _each(self, callback);
   } else {
-    self._next(function(err, item) {
+    self.next(function(err, item) {
       if(err) return handleCallback(callback, err);
       if(item == null) {
         self.s.state = Cursor.CLOSED;

test/functional/cursor_tests.js

@@ -2076,6 +2076,39 @@ exports.shouldNotAwaitDataWhenFalse = {
   }
 }
 
+/**
+ * @ignore
+ */
+exports['Should correctly retry tailable cursor connection'] = {
+  // Add a tag that our runner can trigger on
+  // in this case we are setting that node needs to be higher than 0.10.X to run
+  metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
+
+  // The actual test we wish to run
+  test: function(configuration, test) {
+    // http://www.mongodb.org/display/DOCS/Tailable+Cursors
+    var db = configuration.newDbInstance(configuration.writeConcernMax(), {poolSize:1, auto_reconnect:false});
+
+    db.open(function(err, db) {
+      var options = { capped: true, size: 8};
+      db.createCollection('should_await_data', options, function(err, collection) {
+        collection.insert({a:1}, configuration.writeConcernMax(), function(err, result) {
+          var s = new Date();
+          // Create cursor with awaitdata, and timeout after the period specified
+          collection.find({}, {tailable:true, awaitdata:true, numberOfRetries:3, tailableRetryInterval:1000}).each(function(err, result) {
+            if(err != null) {
+              var e = new Date();
+              test.ok((e.getTime() - s.getTime()) >= 3000);
+              db.close();
+              test.done();
+            }
+          });
+        });
+      });
+    });
+  }
+}
+
 /**
  * @ignore
  */