diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2015-01-20 15:21:18 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2015-01-20 15:21:18 +0000 |
| commit | 79b28c03bea34d1536344201cf2e839971eb7fe1 (patch) | |
| tree | a930e39722cfab911e28d456dd022e86b362b50f | |
| parent | b8b7a19b53d4be916d5953f989da53641641b9b9 (diff) | |
| parent | 38a4a9c3d30cc1800e24aaf3efcf6d280d8f0678 (diff) | |
| download | rabbitmq-server-git-79b28c03bea34d1536344201cf2e839971eb7fe1.tar.gz | |
Merge bug26542 (again)
| -rw-r--r-- | src/rabbit_variable_queue.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 57fad266b4..a43578e492 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -1430,7 +1430,10 @@ determine_persist_to(#basic_message{ false -> Est = case is_binary(PropsBin) of true -> BodySize + size(PropsBin); false -> #'P_basic'{headers = Hs} = Props, - length(Hs) * ?HEADER_GUESS_SIZE + BodySize + case Hs of + undefined -> 0; + _ -> length(Hs) + end * ?HEADER_GUESS_SIZE + BodySize end, case Est >= IndexMaxSize of true -> msg_store; |