summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFilipe David Borba Manana <fdmanana@apache.org>2010-07-14 17:51:09 +0000
committerFilipe David Borba Manana <fdmanana@apache.org>2010-07-14 17:51:09 +0000
commit7b3cb1f05e603789544e668155a497676502cb17 (patch)
tree835ac57645048bccaa1df9729ae64c2d08550c6c /src
parent4a3760c2b1bb5f0829d3a643f563adc587c01f39 (diff)
Merge revision 964108 from trunk:
Bug fix: badmatch error after deleting a user doc (uncovered by revision 963723). git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@964109 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/couchdb/couch_auth_cache.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/couchdb/couch_auth_cache.erl b/src/couchdb/couch_auth_cache.erl
index bff801fa..078bfcc1 100644
--- a/src/couchdb/couch_auth_cache.erl
+++ b/src/couchdb/couch_auth_cache.erl
@@ -289,7 +289,7 @@ refresh_entry(Db, #doc_info{high_seq = DocSeq} = DocInfo) ->
[] ->
ok;
[{UserName, {_OldCreds, ATime}}] ->
- {ok, Doc} = couch_db:open_doc(Db, DocInfo, [conflicts]),
+ {ok, Doc} = couch_db:open_doc(Db, DocInfo, [conflicts, deleted]),
NewCreds = user_creds(Doc),
true = ets:insert(?BY_USER, {UserName, {NewCreds, ATime}})
end;