summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2014-04-21 12:18:25 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2014-04-21 12:18:25 +0100
commit14542e04e78dbdb892046cb2f7134aac24ba38b7 (patch)
treef757e15637fd54fe83cbb0c1723e35e45e549a8d
parent1b6a32995b1f42b789ab5c30ba19193121eb2a02 (diff)
parentd59cae70c95cb90e9d59b8ebb1d9ea2a9d474213 (diff)
downloadrabbitmq-server-git-14542e04e78dbdb892046cb2f7134aac24ba38b7.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.