diff options
| author | rockot <rockot@chromium.org> | 2016-03-24 11:25:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 18:26:19 +0000 |
| commit | bd6dc56899588026a824df756f11303150f02cf3 (patch) | |
| tree | 72090c48a3f012edbca581b48434a8862308250e /mojo | |
| parent | 2a56b36b8744bdf0ce95eadce89e14e55c5af971 (diff) | |
| download | chromium_src-bd6dc56899588026a824df756f11303150f02cf3.zip chromium_src-bd6dc56899588026a824df756f11303150f02cf3.tar.gz chromium_src-bd6dc56899588026a824df756f11303150f02cf3.tar.bz2 | |
[mojo-edk] Don't assert on PortAccepted for unknown port
It's possible for a proxy port to be closed before a
PortAccepted message is processed for it. This can happen if
a node accepts the new port (the proxy's target) then dies
immediately after sending the corresponding PortAccepted
message.
In this case we should not be asserting. It's safe to fail
silently.
BUG=592905
TBR=amistry@chromium.org
Review URL: https://codereview.chromium.org/1833683002
Cr-Commit-Position: refs/heads/master@{#383100}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/edk/system/ports/node.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/edk/system/ports/node.cc b/mojo/edk/system/ports/node.cc index aca9a55..266ee84 100644 --- a/mojo/edk/system/ports/node.cc +++ b/mojo/edk/system/ports/node.cc @@ -553,7 +553,7 @@ int Node::OnUserMessage(ScopedMessage message) { int Node::OnPortAccepted(const PortName& port_name) { scoped_refptr<Port> port = GetPort(port_name); if (!port) - return OOPS(ERROR_PORT_UNKNOWN); + return ERROR_PORT_UNKNOWN; { // We must hold |ports_lock_| before grabbing the port lock because |