diff options
| author | Michael Klishin <michael@novemberain.com> | 2015-12-30 06:59:20 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@novemberain.com> | 2015-12-30 06:59:20 +0300 |
| commit | e0c8ceda910f2fc597d276868cab995bcb2fe202 (patch) | |
| tree | 3672064ae460a7cac3896bbf8e1f035764890cb0 | |
| parent | bdc34555592f9bbc8c3b0a5ae996208aa5731bbc (diff) | |
| parent | 747552dbd2a04123c2306c316b31a1d1a7dd9312 (diff) | |
| download | rabbitmq-server-git-e0c8ceda910f2fc597d276868cab995bcb2fe202.tar.gz | |
Merge pull request #516 from rabbitmq/rabbitmq-server-328
Adds exception handling to rabbit_vm:bytes/1
| -rw-r--r-- | src/rabbit_vm.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl index 50b60509e2..53885a8f9b 100644 --- a/src/rabbit_vm.erl +++ b/src/rabbit_vm.erl @@ -123,7 +123,11 @@ ets_memory(OwnerNames) -> O <- [ets:info(T, owner)], lists:member(O, Owners)]). -bytes(Words) -> Words * erlang:system_info(wordsize). +bytes(Words) -> try + Words * erlang:system_info(wordsize) + catch + _:_ -> 0 + end. interesting_sups() -> [[rabbit_amqqueue_sup_sup], conn_sups() | interesting_sups0()]. |
