mojo/edk/system/node_channel.cc - Issue 1985993002: [mojo-edk] Fix bootstrap NodeChannel Start/ShutDown race

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/edk/system/node_channel.cc

Issue 1985993002: [mojo-edk] Fix bootstrap NodeChannel Start/ShutDown race (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: mojo/edk/system/node_channel.cc

diff --git a/mojo/edk/system/node_channel.cc b/mojo/edk/system/node_channel.cc

index 885750d66786674d008f5f75e7b65d54a99240ca..3135acbd152369caf1db0bada894e6e2840a6d79 100644

--- a/mojo/edk/system/node_channel.cc

+++ b/mojo/edk/system/node_channel.cc

@@ -172,8 +172,9 @@ void NodeChannel::Start() {

#endif

base::AutoLock lock(channel_lock_);

- DCHECK(channel_);

- channel_->Start();

+ // ShutDown() may have already been called, in which case |channel_| is null.

+ if (channel_)

+ channel_->Start();

}

void NodeChannel::ShutDown() {

« no previous file with comments | « no previous file | no next file » | no next file with comments »