Merge 6f28746 into 8bc959a

salesforce · Mar 16, 2019 · 2795b50 · 2795b50
2 parents 8bc959a + 6f28746
commit 2795b50
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/remoteCollection/handleCollectResponse.js b/src/remoteCollection/handleCollectResponse.js
@@ -140,7 +140,12 @@ function generateSamples(collectRes) {
    */
   const func = RefocusCollectorEval.getTransformFunction(tr, status);
   if (func) {
-    return RefocusCollectorEval.safeTransform(func, args);
+    try {
+      return RefocusCollectorEval.safeTransform(func, args);
+    } catch (err) {
+      const errorMessage = `Transform error: ${err.message} (${collectRes.preparedUrl})`;
+      return errorSamples(collectRes, errorMessage);
+    }
   }
 
   // Default error samples

diff --git a/src/utils/httpUtils.js b/src/utils/httpUtils.js
@@ -138,11 +138,6 @@ function doBulkUpsert(url, userToken, intervalSecs, proxy, arr) {
     return Promise.resolve(e);
   }
 
-  // Don't bother sending a POST if the array is empty.
-  if (arr.length === 0) {
-    return Promise.resolve(true);
-  }
-
   url += bulkUpsertEndpoint;
   return new Promise((resolve) => {
     debug('Bulk upserting %d samples to %s', arr.length, url);