diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-07-05 17:52:16 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-07-05 17:52:16 +0100 |
| commit | 5d033df8b6b56507a50f26ab7db0132fe51583ee (patch) | |
| tree | 3c0452c5e076ad5398c88e081c6109455ec8870a /src | |
| parent | b2283b6c3e8700ad59e27194cea46adf93c58640 (diff) | |
| parent | cf86b976d4b0be38c973352e1130ca993b7b01d5 (diff) | |
| download | rabbitmq-server-git-5d033df8b6b56507a50f26ab7db0132fe51583ee.tar.gz | |
Merge default into bug22889
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_channel.erl | 9 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 3c2ae72d90..213b6624d5 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -427,12 +427,9 @@ handle_method(#'basic.publish'{exchange = ExchangeNameBin, Exchange, rabbit_basic:delivery(Mandatory, Immediate, TxnKey, Message)), case RoutingRes of - routed -> - ok; - unroutable -> - ok = basic_return(Message, WriterPid, no_route); - not_delivered -> - ok = basic_return(Message, WriterPid, no_consumers) + routed -> ok; + unroutable -> ok = basic_return(Message, WriterPid, no_route); + not_delivered -> ok = basic_return(Message, WriterPid, no_consumers) end, {noreply, case TxnKey of none -> State; diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 9fbf7ce8e7..10118071df 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -798,8 +798,8 @@ map_exception(Channel, Reason, Protocol) -> ShouldClose = SuggestedClose or (Channel == 0), {ClassId, MethodId} = case FailedMethod of {_, _} -> FailedMethod; - none -> {0, 0}; - _ -> Protocol:method_id(FailedMethod) + none -> {0, 0}; + _ -> Protocol:method_id(FailedMethod) end, {CloseChannel, CloseMethod} = case ShouldClose of |