summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-08-07 00:46:17 +0100
committerMatthias Radestock <matthias@lshift.net>2009-08-07 00:46:17 +0100
commit8b99b9b278d7bee1d2b5eb13da831e16656c26c6 (patch)
treef315b4fc3cfe91d660c86967412d45eb6224c158
parenta47fbc03f8e62d2fbc2179aa3f0dd9dedc565e83 (diff)
downloadrabbitmq-server-git-8b99b9b278d7bee1d2b5eb13da831e16656c26c6.tar.gz
don't ignore Debug info in pre/post-hibernate hook return handling
-rw-r--r--src/gen_server2.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gen_server2.erl b/src/gen_server2.erl
index 509abeb09f..5578342bfb 100644
--- a/src/gen_server2.erl
+++ b/src/gen_server2.erl
@@ -529,12 +529,12 @@ pre_hibernate(Parent, Name, State, Mod, TimeoutState, Queue, Debug) ->
hibernate(Parent, Name, NState, Mod, TimeoutState, Queue,
Debug);
{stop, Reason, NState} ->
- terminate(Reason, Name, pre_hibernate, Mod, NState, []);
+ terminate(Reason, Name, pre_hibernate, Mod, NState, Debug);
{'EXIT', What} ->
- terminate(What, Name, pre_hibernate, Mod, State, []);
+ terminate(What, Name, pre_hibernate, Mod, State, Debug);
Reply ->
terminate({bad_return_value, Reply}, Name, pre_hibernate,
- Mod, State, [])
+ Mod, State, Debug)
end;
false ->
hibernate(Parent, Name, State, Mod, TimeoutState, Queue, Debug)
@@ -551,12 +551,12 @@ post_hibernate(Parent, Name, State, Mod, TimeoutState, Queue, Debug) ->
process_next_msg(Parent, Name, NState, Mod, Time,
TimeoutState, Queue, Debug);
{stop, Reason, NState} ->
- terminate(Reason, Name, post_hibernate, Mod, NState, []);
+ terminate(Reason, Name, post_hibernate, Mod, NState, Debug);
{'EXIT', What} ->
- terminate(What, Name, post_hibernate, Mod, State, []);
+ terminate(What, Name, post_hibernate, Mod, State, Debug);
Reply ->
terminate({bad_return_value, Reply}, Name, post_hibernate,
- Mod, State, [])
+ Mod, State, Debug)
end;
false ->
%% use hibernate here, not infinity. This matches