summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_file.erl
diff options
context:
space:
mode:
authorDamien F. Katz <damien@apache.org>2008-08-22 17:37:04 +0000
committerDamien F. Katz <damien@apache.org>2008-08-22 17:37:04 +0000
commit50d8dcda77661677c1bd2cf9a557afc6e065441b (patch)
tree865eca95e2b21bf1d9f9de6212ca3f2a23b80dd4 /src/couchdb/couch_file.erl
parentd57e63bf4580f6a0615d5a4fae81df5bd3e7ea0a (diff)
Fix for couch_server process crash when databases that don't exist are attempted to be opened. Removed old comments and fixed the AllowRemoteRestart testing option.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@688129 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_file.erl')
-rw-r--r--src/couchdb/couch_file.erl5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/couchdb/couch_file.erl b/src/couchdb/couch_file.erl
index 5ccb521b..8101fdd2 100644
--- a/src/couchdb/couch_file.erl
+++ b/src/couchdb/couch_file.erl
@@ -45,6 +45,11 @@ open(Filepath, Options) ->
{FdPid, ok} ->
{ok, FdPid};
{FdPid, Error} ->
+ case process_info(self(), trap_exit) of
+ {trap_exit, true} ->
+ receive {'EXIT', FdPid, _} -> ok end;
+ _ -> ok
+ end,
Error
end;
Error ->