diff options
| author | Alvaro Videla <videlalvaro@gmail.com> | 2015-10-14 08:32:41 +0200 |
|---|---|---|
| committer | Alvaro Videla <videlalvaro@gmail.com> | 2015-10-14 08:32:41 +0200 |
| commit | b57fd49355334875ce5f2a47e83357e210f632d5 (patch) | |
| tree | 041f304000ad17d73dd5e222606dfdde338e27cf /src | |
| parent | 6c3de1303e4a1175fa3e222ff7a47a83cb258bbc (diff) | |
| parent | 2a8965162129d1af95683a6a737017f4b6eea157 (diff) | |
| download | rabbitmq-server-git-b57fd49355334875ce5f2a47e83357e210f632d5.tar.gz | |
Merge branch 'master' into rabbitmq-server-351
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_variable_queue.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 441eafd006..4565dea8db 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -964,7 +964,8 @@ head_message_timestamp(Q3, Q4, RPA, QPA) -> [ get_qs_head([Q4, Q3]), get_pa_head(RPA), get_pa_head(QPA) ], - HeadMsgStatus /= undefined ], + HeadMsgStatus /= undefined, + HeadMsgStatus#msg_status.msg /= undefined ], Timestamps = [Timestamp || HeadMsg <- HeadMsgs, |