Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 1639 invoked from network); 4 Mar 2010 05:16:32 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Mar 2010 05:16:32 -0000 Received: (qmail 69263 invoked by uid 500); 4 Mar 2010 05:16:22 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 69152 invoked by uid 500); 4 Mar 2010 05:16:22 -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 69145 invoked by uid 99); 4 Mar 2010 05:16:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Mar 2010 05:16:21 +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; Thu, 04 Mar 2010 05:16:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D622B23889CB; Thu, 4 Mar 2010 05:16:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r918855 - in /couchdb/trunk: share/www/script/test/reader_acl.js src/couchdb/couch_db.erl Date: Thu, 04 Mar 2010 05:16:00 -0000 To: commits@couchdb.apache.org From: jchris@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100304051600.D622B23889CB@eris.apache.org> Author: jchris Date: Thu Mar 4 05:16:00 2010 New Revision: 918855 URL: http://svn.apache.org/viewvc?rev=918855&view=rev Log: ensure full commit when the security object is updated Modified: couchdb/trunk/share/www/script/test/reader_acl.js couchdb/trunk/src/couchdb/couch_db.erl Modified: couchdb/trunk/share/www/script/test/reader_acl.js URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/reader_acl.js?rev=918855&r1=918854&r2=918855&view=diff ============================================================================== --- couchdb/trunk/share/www/script/test/reader_acl.js (original) +++ couchdb/trunk/share/www/script/test/reader_acl.js Thu Mar 4 05:16:00 2010 @@ -41,6 +41,11 @@ names : ["joe","barb"] } }).ok); + + usersDb.ensureFullCommit(); + // security changes will always commit synchronously + restartServer(); + // can't read it as jchris T(CouchDB.login("jchris@apache.org", "funnybone").ok); T(CouchDB.session().userCtx.name == "jchris@apache.org"); Modified: couchdb/trunk/src/couchdb/couch_db.erl URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_db.erl?rev=918855&r1=918854&r2=918855&view=diff ============================================================================== --- couchdb/trunk/src/couchdb/couch_db.erl (original) +++ couchdb/trunk/src/couchdb/couch_db.erl Thu Mar 4 05:16:00 2010 @@ -291,7 +291,9 @@ set_security(#db{update_pid=Pid}=Db, {NewSecProps}) when is_list(NewSecProps) -> check_is_admin(Db), ok = validate_security_object(NewSecProps), - gen_server:call(Pid, {set_security, NewSecProps}, infinity); + ok = gen_server:call(Pid, {set_security, NewSecProps}, infinity), + {ok, _} = ensure_full_commit(Db), + ok; set_security(_, _) -> throw(bad_request).