From commits-return-4631-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Sat Jul 03 15:36:17 2010 Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 87203 invoked from network); 3 Jul 2010 15:36:17 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 3 Jul 2010 15:36:17 -0000 Received: (qmail 33140 invoked by uid 500); 3 Jul 2010 15:36:17 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 33043 invoked by uid 500); 3 Jul 2010 15:36:16 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 33036 invoked by uid 99); 3 Jul 2010 15:36:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Jul 2010 15:36:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Jul 2010 15:36:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DE94023889DD; Sat, 3 Jul 2010 15:34:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r960229 - /couchdb/trunk/src/couchdb/couch_auth_cache.erl Date: Sat, 03 Jul 2010 15:34:50 -0000 To: commits@couchdb.apache.org From: fdmanana@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100703153450.DE94023889DD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fdmanana Date: Sat Jul 3 15:34:50 2010 New Revision: 960229 URL: http://svn.apache.org/viewvc?rev=960229&view=rev Log: Replacing call couch_httpd_db:couch_doc_open/4 with call to couch_db:open_doc/2. It's more correct from a design point of view. Modified: couchdb/trunk/src/couchdb/couch_auth_cache.erl Modified: couchdb/trunk/src/couchdb/couch_auth_cache.erl URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_auth_cache.erl?rev=960229&r1=960228&r2=960229&view=diff ============================================================================== --- couchdb/trunk/src/couchdb/couch_auth_cache.erl (original) +++ couchdb/trunk/src/couchdb/couch_auth_cache.erl Sat Jul 3 15:34:50 2010 @@ -392,12 +392,12 @@ ensure_users_db_exists(DbName, Options) end. ensure_auth_ddoc_exists(Db, DDocId) -> - try - couch_httpd_db:couch_doc_open(Db, DDocId, nil, []) - catch - _:_Error -> + case couch_db:open_doc(Db, DDocId) of + {not_found, _Reason} -> {ok, AuthDesign} = auth_design_doc(DDocId), - {ok, _Rev} = couch_db:update_doc(Db, AuthDesign, []) + {ok, _Rev} = couch_db:update_doc(Db, AuthDesign, []); + _ -> + ok end, ok.