Merge 228bc75 into 43a1f53

strongloop · Oct 15, 2018 · 93b309e · 93b309e
2 parents 43a1f53 + 228bc75
commit 93b309e
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/server/middleware/rest.js b/server/middleware/rest.js
@@ -73,8 +73,21 @@ function rest() {
     if (handlers.length === 1) {
       return handlers[0](req, res, next);
     }
-    async.eachSeries(handlers, function(handler, done) {
-      handler(req, res, done);
-    }, next);
+
+    executeHandlers(handlers, req, res, next);
   };
 }
+
+// A trimmed-down version of async.series that preserves current CLS context
+function executeHandlers(handlers, req, res, cb) {
+  var ix = -1;
+  next();
+
+  function next(err) {
+    if (err || ++ix >= handlers.length) {
+      cb(err);
+    } else {
+      handlers[ix](req, res, next);
+    }
+  }
+}