Refs #5122, #5125: Add err to callback

lib/pipeline/documentSources/CursorDocumentSource.js

@@ -84,7 +84,7 @@ proto.getNext = function getNext(callback) {
 
 		if (this._currentBatch.length <= this._curIdx) {
 			if (callback)
-				return callback(DocumentSource.EOF);
+				return callback(null, DocumentSource.EOF);
 			return DocumentSource.EOF;
 		}
 	}
@@ -94,7 +94,7 @@ proto.getNext = function getNext(callback) {
 	this._curIdx++;
 
 	if (callback)
-		return callback(out);
+		return callback(null, out);
 	return out;
 };
 

lib/pipeline/documentSources/LimitDocumentSource.js

@@ -48,12 +48,12 @@ proto.getNext = function getNext(callback) {
 	if (++this.count > this.limit) {
 		this.source.dispose();
 		if (callback)
-			return callback(DocumentSource.EOF);
+			return callback(null, DocumentSource.EOF);
 		return DocumentSource.EOF;
 	}
 
 	if (callback)
-		return this.source.getNext(callback);
+		return this.source.getNext(null, callback);
 	return this.source.getNext();
 };
 

test/lib/pipeline/documentSources/CursorDocumentSource.js

@@ -67,17 +67,17 @@ module.exports = {
 				cwc._cursor = new Cursor( [1,2,3,4] );
 
 				var cds = new CursorDocumentSource(cwc);
-				cds.getNext(function(val) {
+				cds.getNext(function(err,val) {
 					assert.equal(val, 1);
-					cds.getNext(function(val) {
+					cds.getNext(function(err,val) {
 						assert.equal(val, 2);
-						cds.getNext(function(val) {
+						cds.getNext(function(err,val) {
 							assert.equal(val, 3);
-							cds.getNext(function(val) {
+							cds.getNext(function(err,val) {
 								assert.equal(val, 4);
-								cds.getNext(function(val) {
+								cds.getNext(function(err,val) {
 									assert.equal(val, DocumentSource.EOF);
-									return next();
+									next();
 								});
 							});
 						});

test/lib/pipeline/documentSources/LimitDocumentSource.js

@@ -53,8 +53,8 @@ module.exports = {
 			"should return the current document source": function currSource(next){
 				var lds = new LimitDocumentSource();
 				lds.limit = 1;
-				lds.source = {getNext:function(cb){cb({ item:1 });}};
-				lds.getNext(function(val) {
+				lds.source = {getNext:function(err,cb){cb(null,{ item:1 });}};
+				lds.getNext(function(err,val) {
 					assert.deepEqual(val, { item:1 });
 					next();
 				});
@@ -65,16 +65,16 @@ module.exports = {
 				lds.limit = 10;
 				lds.source = {
 					calls: 0,
-					getNext:function(cb) {
+					getNext:function(err,cb) {
 						if (lds.source.calls)
-							return cb(DocumentSource.EOF);
+							return cb(null,DocumentSource.EOF);
 						lds.source.calls++;
-						return cb({item:1});
+						return cb(null,{item:1});
 					},
 					dispose:function() { return true; }
 				};
 				lds.getNext(function(){});
-				lds.getNext(function(val) {
+				lds.getNext(function(err,val) {
 					assert.strictEqual(val, DocumentSource.EOF);
 					next();
 				});
@@ -85,15 +85,15 @@ module.exports = {
 				lds.limit = 1;
 				lds.source = {
 					calls: 0,
-					getNext:function(cb) {
+					getNext:function(err,cb) {
 						if (lds.source.calls)
-							return cb(DocumentSource.EOF);
-						return cb({item:1});
+							return cb(null,DocumentSource.EOF);
+						return cb(null,{item:1});
 					},
 					dispose:function() { return true; }
 				};
 				lds.getNext(function(){});
-				lds.getNext(function (val) {
+				lds.getNext(function (err,val) {
 					assert.strictEqual(val, DocumentSource.EOF);
 					next();
 				});