diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2014-04-15 11:13:10 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2014-04-15 11:13:10 +0100 |
| commit | c1a0b20ba7771e092612880d0e3f3b42287006a7 (patch) | |
| tree | 7382fa2646e29d9b86285f819d9aa38d8e50196d | |
| parent | ac467c33739c51e9464f6f8192a09f3973f7d940 (diff) | |
| parent | 250fed8cf302789e0fe3c9b1cb3c682b5d784cb8 (diff) | |
| download | rabbitmq-server-c1a0b20ba7771e092612880d0e3f3b42287006a7.tar.gz | |
merge stable into default
| -rw-r--r-- | src/rabbit_dead_letter.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rabbit_dead_letter.erl b/src/rabbit_dead_letter.erl index ec32e687..728bc431 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. |