Merge branch '2.0' into 3.2-features

Author: christkv

lib/cursor.js

@@ -182,21 +182,31 @@ Cursor.prototype.hasNext = function(callback) {
   var self = this;
 
   // Execute using callback
-  if(typeof callback == 'function') return nextObject(self, function(err, doc) {
-    if(!doc) return callback(null, false);
-    self.s.currentDoc = doc;
-    callback(null, true);
-  });
+  if(typeof callback == 'function') {
+    if(self.s.currentDoc){
+      return callback(null, true);
+    } else {
+      return nextObject(self, function(err, doc) {
+        if(!doc) return callback(null, false);
+        self.s.currentDoc = doc;
+        callback(null, true);
+      });
+    }
+  }
 
   // Return a Promise
   return new this.s.promiseLibrary(function(resolve, reject) {
-    nextObject(self, function(err, doc) {
-      if(self.s.state == Cursor.CLOSED || self.isDead()) return resolve(false);
-      if(err) return reject(err);
-      if(!doc) return resolve(false);
-      self.s.currentDoc = doc;
+    if(self.s.currentDoc){
       resolve(true);
-    });
+    } else {
+      nextObject(self, function(err, doc) {
+        if(self.s.state == Cursor.CLOSED || self.isDead()) return resolve(false);
+        if(err) return reject(err);
+        if(!doc) return resolve(false);
+        self.s.currentDoc = doc;
+        resolve(true);
+      });
+    }
   });
 }