summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@novemberain.com>2015-10-14 09:09:30 +0300
committerMichael Klishin <michael@novemberain.com>2015-10-14 09:09:30 +0300
commit2a8965162129d1af95683a6a737017f4b6eea157 (patch)
treedfd1702fc3e3bdd8daf0773064bc19156180161c
parent63eccd863a493795a92941af3be41af364e1d637 (diff)
parentdb51b46135e591c0925411e0076e089eecdeb789 (diff)
downloadrabbitmq-server-git-2a8965162129d1af95683a6a737017f4b6eea157.tar.gz
Merge pull request #359 from rabbitmq/rabbitmq-server-358
fixes failing test
-rw-r--r--src/rabbit_variable_queue.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index 5e7672e7f0..d1f45ade4f 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -894,7 +894,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,