summaryrefslogtreecommitdiff
path: root/lib/kernel/src/net_kernel.erl
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kernel/src/net_kernel.erl')
-rw-r--r--lib/kernel/src/net_kernel.erl17
1 files changed, 11 insertions, 6 deletions
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index b857000a80..4c8dd1e2b5 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -796,12 +796,17 @@ handle_info({AcceptPid, {accept_pending,MyNode,Node,Address,Type}}, State) ->
%% change pending process.
%%
OldOwner = Conn#connection.owner,
- ?debug({net_kernel, remark, old, OldOwner, new, AcceptPid}),
- exit(OldOwner, remarked),
- receive
- {'EXIT', OldOwner, _} ->
- true
- end,
+ case maps:is_key(OldOwner, State#state.conn_owners) of
+ true ->
+ ?debug({net_kernel, remark, old, OldOwner, new, AcceptPid}),
+ exit(OldOwner, remarked),
+ receive
+ {'EXIT', OldOwner, _} ->
+ true
+ end;
+ false ->
+ ok % Owner already exited
+ end,
ets:insert(sys_dist, Conn#connection{owner = AcceptPid}),
AcceptPid ! {self(),{accept_pending,ok_pending}},
Owners = maps:remove(OldOwner, State#state.conn_owners),