summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-09-15 10:00:37 +0100
committerMatthias Radestock <matthias@lshift.net>2009-09-15 10:00:37 +0100
commit5fa1eda0d38250162e7759104d1a3d2eff8791cd (patch)
treebe9bf11b2a5109e594507f9dbf36b8c3347573f5 /src
parenta02a114ca9e1e5604503809bc7c4a8f32dbbf2de (diff)
parent41872a474b511d3749f888d0b6369666aa9eed44 (diff)
downloadrabbitmq-server-git-5fa1eda0d38250162e7759104d1a3d2eff8791cd.tar.gz
merge bug21529 into default
Diffstat (limited to 'src')
-rw-r--r--src/gen_server2.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gen_server2.erl b/src/gen_server2.erl
index 36fb4fa8c3..47ae545bca 100644
--- a/src/gen_server2.erl
+++ b/src/gen_server2.erl
@@ -437,7 +437,10 @@ unregister_name({local,Name}) ->
unregister_name({global,Name}) ->
_ = global:unregister_name(Name);
unregister_name(Pid) when is_pid(Pid) ->
- Pid.
+ Pid;
+% Under R12 let's just ignore it, as we have a single term as Name.
+% On R13 it will never get here, as we get tuple with 'local/global' atom.
+unregister_name(Name) -> ok.
extend_backoff(undefined) ->
undefined;