fix(apm): only rebuilt cursor if reply is non-null

mongodb · Nov 20, 2017 · 96052c8 · 96052c8
1 parent 4242d49
commit 96052c8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/apm.js b/lib/apm.js
@@ -520,7 +520,7 @@ var Instrumentation = function(core, options, callback) {
                 r = r.documents[0];
               }
 
-              if (commandName.toLowerCase() === 'getmore' && r.cursor == null) {
+              if (commandName.toLowerCase() === 'getmore' && (r == null || r.cursor == null)) {
                 r = {
                   cursor: {
                     id: cursor.cursorState.cursorId,
@@ -533,7 +533,7 @@ var Instrumentation = function(core, options, callback) {
                 (commandName.toLowerCase() === 'find' ||
                   commandName.toLowerCase() === 'aggregate' ||
                   commandName.toLowerCase() === 'listcollections') &&
-                r.cursor == null
+                (r == null || r.cursor == null)
               ) {
                 r = {
                   cursor: {