domain: do not add domain to promise from other context · nodejs/node@5500ae9 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 635
• Pull requests 751
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 5500ae9

Browse filesBrowse the repository at this point in the historyBrowse files

Stephen Belanger

authored and

MylesBorins

committed

domain: do not add domain to promise from other context

PR-URL: #39135 Backport-PR-URL: #39742 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>

1 parent fc29ddb commit 5500ae9
Copy full SHA for 5500ae9

1 file changed

+9-6Lines changed: 9 additions & 6 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib
  • domain.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/domain.js‎

Copy file name to clipboardExpand all lines: lib/domain.js

+9-6Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
@@ -36,6 +36,7 @@ const {
36	36	Error,
37	37	FunctionPrototypeCall,
38	38	ObjectDefineProperty,
	39	+ Promise,
39	40	ReflectApply,
40	41	SafeMap,
41	42	Symbol,
@@ -73,12 +74,14 @@ const asyncHook = createHook({
73	74	if (process.domain !== null && process.domain !== undefined) {
74	75	// If this operation is created while in a domain, let's mark it
75	76	pairing.set(asyncId, process.domain[kWeak]);
76		- ObjectDefineProperty(resource, 'domain', {
77		- configurable: true,
78		- enumerable: false,
79		- value: process.domain,
80		- writable: true
81		- });
	77	+ if (type !== 'PROMISE' || resource instanceof Promise) {
	78	+ ObjectDefineProperty(resource, 'domain', {
	79	+ configurable: true,
	80	+ enumerable: false,
	81	+ value: process.domain,
	82	+ writable: true
	83	+ });
	84	+ }
82	85	}
83	86	},
84	87	before(asyncId) {

0 commit comments

Comments

0 (0)