summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2011-01-16 18:39:58 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2011-01-16 18:39:58 +0000
commit074a34ffbd0fc2a366906da8f6fcdca838cd6876 (patch)
tree088b188efb4023d71b91ca6af589c40c5ba17f7a
parentb687b817842e55c8eb09c2ac1ac777241fb596f6 (diff)
downloadrabbitmq-server-074a34ffbd0fc2a366906da8f6fcdca838cd6876.tar.gz
cosmetic
-rw-r--r--src/rabbit_msg_store.erl18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index 4028f5d2..d7cac016 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -1227,17 +1227,16 @@ mark_handle_open(FileHandlesEts, File, Ref) ->
%% See comment in client_read3 - only call this when the file is locked
mark_handle_to_close(ClientRefs, FileHandlesEts, File, Invoke) ->
[ begin
- case ets:update_element(FileHandlesEts, Key, {2, close})
- andalso Invoke of
+ case (ets:update_element(FileHandlesEts, Key, {2, close})
+ andalso Invoke) of
true -> case dict:fetch(Ref, ClientRefs) of
{_MsgOnDiskFun, undefined} -> ok;
{_MsgOnDiskFun, CloseFDsFun} -> ok = CloseFDsFun()
end;
false -> ok
end
- end ||
- {{Ref, _File} = Key, open} <-
- ets:match_object(FileHandlesEts, {{'_', File}, open}) ],
+ end || {{Ref, _File} = Key, open} <-
+ ets:match_object(FileHandlesEts, {{'_', File}, open}) ],
true.
safe_file_delete_fun(File, Dir, FileHandlesEts) ->
@@ -1247,11 +1246,10 @@ safe_file_delete(File, Dir, FileHandlesEts) ->
%% do not match on any value - it's the absence of the row that
%% indicates the client has really closed the file.
case ets:match_object(FileHandlesEts, {{'_', File}, '_'}, 1) of
- {[_|_], _Cont} ->
- false;
- _ ->
- ok = file:delete(form_filename(Dir, filenum_to_name(File))),
- true
+ {[_|_], _Cont} -> false;
+ _ -> ok = file:delete(
+ form_filename(Dir, filenum_to_name(File))),
+ true
end.
close_all_indicated(#client_msstate { file_handles_ets = FileHandlesEts,