github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts with merge on latest 2.8.

Browse Source
This commit is contained in:
Matheus Castro
2022-10-19 17:22:22 -03:00
parent 6b4345b6a3
commit e52001e7d3
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
packages/meteor/dynamics_nodejs.js
View File

@@ -99,12 +99,11 @@ EVp.withValue = async function (value, func) {
meteorDynamics = [];
}
const saved = meteorDynamics[this.slot];
const saved = meteorDynamics[this.slot] || {};
try {
meteorDynamics[this.slot] = value;
Meteor._updateAslStore('_meteor_dynamics', meteorDynamics);
const result = await func();
return result;
return await func();
} finally {
meteorDynamics[this.slot] = saved;
Meteor._updateAslStore('_meteor_dynamics', meteorDynamics);
@@ -120,18 +119,33 @@ EVp.withValue = async function (value, func) {
* @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;
if (Meteor._isFibersEnabled) {
Meteor._nodeCodeMustBeInFiber();
Fiber.current._meteor_dynamics[this.slot] = context;
return;
}
Meteor._updateAslStore("_meteor_dynamics", context);
};
EVp._setNewContextAndGetCurrent = function (value) {
Meteor._nodeCodeMustBeInFiber();
if (!Fiber.current._meteor_dynamics) {
Fiber.current._meteor_dynamics = [];
if (Meteor._isFibersEnabled) {
Meteor._nodeCodeMustBeInFiber();
if (!Fiber.current._meteor_dynamics) {
Fiber.current._meteor_dynamics = [];
}
const saved = Fiber.current._meteor_dynamics[this.slot];
this._set(value);
return saved;
}
const saved = Fiber.current._meteor_dynamics[this.slot];
let meteorDynamics = Meteor._getValueFromAslStore('_meteor_dynamics');
if (!meteorDynamics) {
meteorDynamics = [];
}
const saved = meteorDynamics[this.slot];
this._set(value);
return saved;
};