From a07bfd3a2e303623f93164552ec2c16dc0c5f3d2 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 22 Mar 2014 12:44:12 -0600 Subject: [PATCH] Refactored fix for previous commit --- lib/daemon.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/daemon.js b/lib/daemon.js index 1779493..9bad748 100644 --- a/lib/daemon.js +++ b/lib/daemon.js @@ -141,11 +141,9 @@ function DaemonInterface(options){ async.each(instances, function(instance, eachCallback){ var itemFinished = function(error, result){ - if (result == null) { - var returnObj = {error: error, response: null, instance: instance}; - } else { - var returnObj = {error: error, response: result.result, instance: instance}; - } + + var returnObj = {error: error, response: (result || {}).result, instance: instance}; + if (streamResults) callback(returnObj); else results.push(returnObj); eachCallback();