New upstream version 6.0.20upstream

1 files changed, 7 insertions, 1 deletions

diff --git a/src/mongo/shell/query.js b/src/mongo/shell/query.js
index a5d920cb109..b43e13c23e8 100644
--- a/src/mongo/shell/query.js
+++ b/src/mongo/shell/query.js
@@ -98,6 +98,10 @@ DBQuery.prototype._canUseCommandCursor = function() {
         (this._options & DBQuery.Option.exhaust) === 0;
 };
 
+DBQuery.prototype._isTailableCursor = function() {
+    return (this._options & DBQuery.Option.tailable) !== 0;
+};
+
 /**
  * This method is exposed only for the purpose of testing and should not be used in most contexts.
  *
@@ -301,7 +305,9 @@ DBQuery.prototype.skip = function(skip) {
 DBQuery.prototype.hasNext = function() {
     this._exec();
 
-    if (this._limit > 0 && this._cursorSeen >= this._limit) {
+    // Return when limit is reached for tailable cursors. For other cursor options, like an exhaust
+    // cursor, the server manages closing.
+    if (this._isTailableCursor() && this._limit > 0 && this._cursorSeen >= this._limit) {
         this._cursor.close();
         return false;
     }