aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-11-26 18:09:01 +0100
committerRickard Green <[email protected]>2018-11-26 18:09:01 +0100
commit056b5ef1babe19d0584e3b8daa797a6f10b99854 (patch)
treee2cd287d6d0d5e01b00e1a05da2c69031ab27ee7 /lib/kernel
parent80ee7211fa2d1ad58e53c438b4615388796fb601 (diff)
parent7fa32e36811029ff6f88229cdc5e2a0f97e72946 (diff)
downloadotp-056b5ef1babe19d0584e3b8daa797a6f10b99854.tar.gz
otp-056b5ef1babe19d0584e3b8daa797a6f10b99854.tar.bz2
otp-056b5ef1babe19d0584e3b8daa797a6f10b99854.zip
Merge branch 'maint'
* maint: kernel: Fix bug in net_kernel for connection attempt from self
Diffstat (limited to 'lib/kernel')
-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 01d809b566..4915193196 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;