Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A570812B0 for ; Tue, 19 Apr 2011 20:10:33 +0000 (UTC) Received: (qmail 6269 invoked by uid 500); 19 Apr 2011 20:10:33 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 6233 invoked by uid 500); 19 Apr 2011 20:10:33 -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 6226 invoked by uid 99); 19 Apr 2011 20:10:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Apr 2011 20:10:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 19 Apr 2011 20:10:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 60C4023889E3; Tue, 19 Apr 2011 20:10:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1095189 - /couchdb/branches/1.0.x/src/couchdb/couch_db.erl Date: Tue, 19 Apr 2011 20:10:10 -0000 To: commits@couchdb.apache.org From: fdmanana@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110419201010.60C4023889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fdmanana Date: Tue Apr 19 20:10:10 2011 New Revision: 1095189 URL: http://svn.apache.org/viewvc?rev=1095189&view=rev Log: Merged revision 1095188 from trunk: Avoid ocassional crash (noproc error on gen_server call) This happens, for examplem after compacting a database immediately after one of its view groups is compacted. Modified: couchdb/branches/1.0.x/src/couchdb/couch_db.erl Modified: couchdb/branches/1.0.x/src/couchdb/couch_db.erl URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/src/couchdb/couch_db.erl?rev=1095189&r1=1095188&r2=1095189&view=diff ============================================================================== --- couchdb/branches/1.0.x/src/couchdb/couch_db.erl (original) +++ couchdb/branches/1.0.x/src/couchdb/couch_db.erl Tue Apr 19 20:10:10 2011 @@ -95,7 +95,7 @@ reopen(#db{main_pid = Pid, fd_ref_counte ok; false -> couch_ref_counter:add(NewRefCntr), - couch_ref_counter:drop(OldRefCntr) + catch couch_ref_counter:drop(OldRefCntr) end, {ok, NewDb#db{user_ctx = UserCtx}}.