aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-11-29 16:00:19 +0100
committerErlang/OTP <[email protected]>2018-11-29 16:00:19 +0100
commitbbf72875ff99fdf5192002d931c3762c2c1fb85e (patch)
tree349e8fa978e1489d1bcedcdffc7fb5e9f0714330
parent9103097e3480b5fa8737205793df56c6288f5733 (diff)
parent044d974adfe7f244374bf534b5dae1a90c58239c (diff)
downloadotp-bbf72875ff99fdf5192002d931c3762c2c1fb85e.tar.gz
otp-bbf72875ff99fdf5192002d931c3762c2c1fb85e.tar.bz2
otp-bbf72875ff99fdf5192002d931c3762c2c1fb85e.zip
Merge branch 'sverker/kernel/net_kernel-failed-accept_pending/ERL-781/OTP-15438' into maint-21
* sverker/kernel/net_kernel-failed-accept_pending/ERL-781/OTP-15438: kernel: Fix bug in net_kernel for connection attempt from self
-rw-r--r--lib/kernel/src/net_kernel.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index 3cf11fd7b1..a9dc77837e 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -808,7 +808,8 @@ handle_info({AcceptPid, {accept_pending,MyNode,Node,Address,Type}}, State) ->
_:_ ->
error_logger:error_msg("~n** Cannot get connection id for node ~w~n",
[Node]),
- AcceptPid ! {self(),{accept_pending,nok_pending}}
+ AcceptPid ! {self(),{accept_pending,nok_pending}},
+ {noreply, State}
end
end;