Merge branch 'stable'

2 files changed, 9 insertions, 6 deletions

diff --git a/src/credit_flow.erl b/src/credit_flow.erl
index edf9805c53..345055a361 100644
--- a/src/credit_flow.erl
+++ b/src/credit_flow.erl
@@ -74,9 +74,9 @@
             %% We deliberately allow Var to escape from the case here
             %% to be used in Expr. Any temporary var we introduced
             %% would also escape, and might conflict.
-            case get(Key) of
-                undefined -> Var = Default;
-                Var       -> ok
+            Var = case get(Key) of
+                undefined -> Default;
+                V         -> V
             end,
             put(Key, Expr)
         end).
diff --git a/src/rabbit_table.erl b/src/rabbit_table.erl
index e716345b85..a873a714e1 100644
--- a/src/rabbit_table.erl
+++ b/src/rabbit_table.erl
@@ -189,9 +189,12 @@ check_content(Tab, TabDef) ->
 
 check(Fun) ->
     case [Error || {Tab, TabDef} <- definitions(),
-                   case Fun(Tab, TabDef) of
-                       ok             -> Error = none, false;
-                       {error, Error} -> true
+                   begin
+                       {Ret, Error} = case Fun(Tab, TabDef) of
+                           ok         -> {false, none};
+                           {error, E} -> {true, E}
+                       end,
+                       Ret
                    end] of
         []     -> ok;
         Errors -> {error, Errors}