diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-08 13:52:09 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-08 13:52:09 +0000 |
| commit | 964812a5905c695ce0d75e5128d36db3097a9120 (patch) | |
| tree | b105bfac8bcd5ce23750131792a750470761c136 | |
| parent | 55f56ebee232c2cbcede34d4fb31bb260ca80286 (diff) | |
| parent | f1b18a4801eddfdcb00e54faaaccbf1d3d9a7af4 (diff) | |
| download | rabbitmq-server-git-964812a5905c695ce0d75e5128d36db3097a9120.tar.gz | |
merge default into bug25260
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 15d7146a15..92b00db066 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -222,13 +222,13 @@ declare(Recover, From, State = #q{q = Q, matches(new, Q1, Q2) -> %% i.e. not policy - Q1#amqqueue.name =:= Q2#amqqueue.name andalso - Q1#amqqueue.durable =:= Q2#amqqueue.durable andalso - Q1#amqqueue.auto_delete =:= Q2#amqqueue.auto_delete andalso + Q1#amqqueue.name =:= Q2#amqqueue.name andalso + Q1#amqqueue.durable =:= Q2#amqqueue.durable andalso + Q1#amqqueue.auto_delete =:= Q2#amqqueue.auto_delete andalso Q1#amqqueue.exclusive_owner =:= Q2#amqqueue.exclusive_owner andalso - Q1#amqqueue.arguments =:= Q2#amqqueue.arguments andalso - Q1#amqqueue.pid =:= Q2#amqqueue.pid andalso - Q1#amqqueue.slave_pids =:= Q2#amqqueue.slave_pids; + Q1#amqqueue.arguments =:= Q2#amqqueue.arguments andalso + Q1#amqqueue.pid =:= Q2#amqqueue.pid andalso + Q1#amqqueue.slave_pids =:= Q2#amqqueue.slave_pids; matches(_, Q, Q) -> true; matches(_, _Q, _Q1) -> false. |