diff options
| author | Anton N Ryabkov <[email protected]> | 2017-04-26 09:19:57 +0700 |
|---|---|---|
| committer | Anton N Ryabkov <[email protected]> | 2017-05-02 08:34:17 +0700 |
| commit | 90a84ea8bb70bf885a83d0aa4dfa598c7f45dc67 (patch) | |
| tree | 5cfd27f95c94580c8a07474fe015e085a5a1c6ca | |
| parent | bf3ead6cdb3a5c7556831b9684574845101f4f36 (diff) | |
| download | otp-90a84ea8bb70bf885a83d0aa4dfa598c7f45dc67.tar.gz otp-90a84ea8bb70bf885a83d0aa4dfa598c7f45dc67.tar.bz2 otp-90a84ea8bb70bf885a83d0aa4dfa598c7f45dc67.zip | |
Fixed rebase conflicts.
| -rw-r--r-- | lib/stdlib/src/gen_fsm.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/gen_fsm.erl b/lib/stdlib/src/gen_fsm.erl index ea4089bd4e..51374f8319 100644 --- a/lib/stdlib/src/gen_fsm.erl +++ b/lib/stdlib/src/gen_fsm.erl @@ -501,7 +501,7 @@ handle_msg(Msg, Parent, Name, StateName, StateData, Mod, _Time, HibernateAfterTi {'EXIT', {undef, [{Mod, handle_info, [_,_,_], _}|_]}} -> error_logger:warning_msg("** Undefined handle_info in ~p~n" "** Unhandled message: ~p~n", [Mod, Msg]), - loop(Parent, Name, StateName, StateData, Mod, infinity, []); + loop(Parent, Name, StateName, StateData, Mod, infinity, HibernateAfterTimeout, []); {'EXIT', What} -> terminate(What, Name, Msg, Mod, StateName, StateData, []); Reply -> |