From 47d4e825e7ca30af02bcc87ca8755c287c1f1152 Mon Sep 17 00:00:00 2001 From: Matheus Castro Date: Mon, 31 Oct 2022 21:22:18 -0300 Subject: [PATCH] Fix merge conflict --- packages/meteor/dynamics_nodejs.js | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/packages/meteor/dynamics_nodejs.js b/packages/meteor/dynamics_nodejs.js index e36699f6c4..2a278acd5e 100644 --- a/packages/meteor/dynamics_nodejs.js +++ b/packages/meteor/dynamics_nodejs.js @@ -121,31 +121,6 @@ class EnvironmentVariableAsync { */ Meteor.EnvironmentVariable = Meteor._isFibersEnabled ? EnvironmentVariableFibers : EnvironmentVariableAsync; -/** - * @summary Set the environment variable to the given value while a function is run - * @locus Anywhere - * @method withValueAsync - * @memberof Meteor.EnvironmentVariable - * @param {Any} value Value the environment variable should be set to - * @param {Function} func The function to run - * @return {Any} Return value of function - */ - -EVp._set = function (context) { - Meteor._nodeCodeMustBeInFiber(); - Fiber.current._meteor_dynamics[this.slot] = context; -}; - -EVp._setNewContextAndGetCurrent = function (value) { - Meteor._nodeCodeMustBeInFiber(); - if (!Fiber.current._meteor_dynamics) { - Fiber.current._meteor_dynamics = []; - } - const saved = Fiber.current._meteor_dynamics[this.slot]; - this._set(value); - return saved; -}; - // Meteor application code is always supposed to be run inside a // fiber. bindEnvironment ensures that the function it wraps is run from // inside a fiber and ensures it sees the values of Meteor environment