summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2014-04-15 11:13:10 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2014-04-15 11:13:10 +0100
commitfb653298540df8236f85e7b014ecf68a863041df (patch)
tree7382fa2646e29d9b86285f819d9aa38d8e50196d
parent7e4c23e4a008e78d89645723c8ebd3794298f348 (diff)
parente31360fc7a6d3ab6b0574246908a1a8e6bf18451 (diff)
downloadrabbitmq-server-git-fb653298540df8236f85e7b014ecf68a863041df.tar.gz
merge stable into default
-rw-r--r--src/rabbit_dead_letter.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rabbit_dead_letter.erl b/src/rabbit_dead_letter.erl
index ec32e6878d..728bc43117 100644
--- a/src/rabbit_dead_letter.erl
+++ b/src/rabbit_dead_letter.erl
@@ -129,6 +129,9 @@ is_cycle(Queue, Deaths) ->
{longstr, <<"rejected">>} =/=
rabbit_misc:table_lookup(D, <<"reason">>);
(_) ->
+ %% There was something we didn't expect, therefore
+ %% a client must have put it there, therefore the
+ %% cycle was not "fully automatic".
false
end, Cycle ++ [H])
end.