diff options
author | Matthias Radestock <matthias@rabbitmq.com> | 2012-12-10 18:15:01 +0000 |
---|---|---|
committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-12-10 18:15:01 +0000 |
commit | efdcf7500e22c1cd5508e6cfde5eab5936b326f0 (patch) | |
tree | e224a44649b900d8790fb222b75ba227c4687144 | |
parent | 1031bf128dfce310530ca3fc063bcd6e8d629ff9 (diff) | |
parent | 56559bc440e7caf02aaf548c0794901a3be43a96 (diff) | |
download | rabbitmq-server-efdcf7500e22c1cd5508e6cfde5eab5936b326f0.tar.gz |
merge stable into default
-rw-r--r-- | src/rabbit_vm.erl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl index e9679276..db674f91 100644 --- a/src/rabbit_vm.erl +++ b/src/rabbit_vm.erl @@ -127,10 +127,13 @@ plugin_memory() -> is_plugin(atom_to_list(App))]). plugin_memory(App) -> - case catch application_master:get_child( - application_controller:get_master(App)) of - {Pid, _} -> sup_memory(Pid); - _ -> 0 + case application_controller:get_master(App) of + undefined -> 0; + Master -> case application_master:get_child(Master) of + {Pid, _} when is_pid(Pid) -> sup_memory(Pid); + Pid when is_pid(Pid) -> sup_memory(Pid); + _ -> 0 + end end. is_plugin("rabbitmq_" ++ _) -> true; |