Cosmeticbug24696

2 files changed, 24 insertions, 29 deletions

diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 090db20c..fa346b6c 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -348,19 +348,18 @@ check_declare_arguments(QueueName, Args) ->
      end || {Key, Fun} <- Checks],
     ok.
 
-check_expires_arg({table, ExpireTable}, Args) ->
-    case rabbit_misc:table_lookup(ExpireTable, <<"after">>) of
+check_expires_arg({table, Expire}, Args) ->
+    case rabbit_misc:table_lookup(Expire, <<"after">>) of
         undefined -> {error, {missing_expiry_table_entry, 'after'}};
         _         -> lists:foldl(
-            fun (Key, ok) ->
-                    case rabbit_misc:table_lookup(ExpireTable, Key) of
-                        undefined -> ok;
-                        KeyVal -> check_bool_arg(KeyVal, Args)
-                    end;
-                (_, Error) ->
-                    Error
-            end, ok, [<<"if_unused">>, <<"if_empty">>]
-        )
+                       fun (Key, ok) ->
+                               case rabbit_misc:table_lookup(Expire, Key) of
+                                   undefined -> ok;
+                                   KeyVal    -> check_bool_arg(KeyVal, Args)
+                               end;
+                           (_, Error) ->
+                               Error
+                       end, ok, [<<"if_unused">>, <<"if_empty">>])
     end;
 
 check_expires_arg(TypeVal, Args) ->
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index e9203ff1..a4db1c82 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -236,18 +236,17 @@ process_args(State = #q{q = #amqqueue{arguments = Arguments}}) ->
        {<<"x-dead-letter-routing-key">>, fun init_dlx_routing_key/2}]).
 
 init_expires(After, State) when is_integer(After)->
-    ensure_expiry_timer(State#q{expires = {After, true, false}});
+    ensure_expiry_timer(State #q{expires = {After, true, false}});
 init_expires(ExpireTable, State) ->
     Lookup = fun (Key, Default) ->
-        case rabbit_misc:table_lookup(ExpireTable, Key) of
-            undefined -> Default;
-            {_Type, Val} -> Val
-        end
-    end,
-    ensure_expiry_timer(State#q{expires = {
-        Lookup(<<"after">>, undefined), % This will always be defined.
-        Lookup(<<"if_unused">>, true),
-        Lookup(<<"if_empty">>, false)}}).
+                 case rabbit_misc:table_lookup(ExpireTable, Key) of
+                     undefined    -> Default;
+                     {_Type, Val} -> Val
+                 end
+             end,
+    ensure_expiry_timer(State #q{expires = {Lookup(<<"after">>, undefined),
+                                            Lookup(<<"if_unused">>, true),
+                                            Lookup(<<"if_empty">>, false)}}).
 
 init_ttl(TTL, State) -> drop_expired_messages(State#q{ttl = TTL}).
 
@@ -334,18 +333,15 @@ stop_expiry_timer(State = #q{expiry_timer_ref = TRef}) ->
     State#q{expiry_timer_ref = undefined}.
 
 ensure_expiry_timer(State = #q{expires          = Expires,
-                               expiry_timer_ref = TRef
-                              }) when Expires ==  undefined orelse
-                                      TRef    =/= undefined ->
+                               expiry_timer_ref = TRef})
+  when Expires ==  undefined orelse TRef =/= undefined ->
     State;
 ensure_expiry_timer(State = #q{expires          = {After, _IfUnused, _IfEmpty},
                                expiry_timer_ref = undefined}) ->
     case should_expire(State) of
-        true ->
-            TRef = erlang:send_after(After, self(), maybe_expire),
-            State#q{expiry_timer_ref = TRef};
-        false ->
-            State
+        true  -> TRef = erlang:send_after(After, self(), maybe_expire),
+                 State#q{expiry_timer_ref = TRef};
+        false -> State
     end.
 
 ensure_stats_timer(State) ->