Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A3D84105DD for ; Fri, 4 Apr 2014 21:03:44 +0000 (UTC) Received: (qmail 3863 invoked by uid 500); 4 Apr 2014 21:03:44 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 3845 invoked by uid 500); 4 Apr 2014 21:03:42 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 3838 invoked by uid 99); 4 Apr 2014 21:03:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2014 21:03:42 +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; Fri, 04 Apr 2014 21:03:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D869F238889B; Fri, 4 Apr 2014 21:03:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1584907 - /subversion/trunk/subversion/svnserve/serve.c Date: Fri, 04 Apr 2014 21:03:20 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140404210320.D869F238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: philip Date: Fri Apr 4 21:03:20 2014 New Revision: 1584907 URL: http://svn.apache.org/r1584907 Log: * subversion/svnserve/serve.c (lock_many, unlock_many): Followup to r1584905, allocate in longer-lived pool and add placeholder to hash so that error is cleared. Modified: subversion/trunk/subversion/svnserve/serve.c Modified: subversion/trunk/subversion/svnserve/serve.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=1584907&r1=1584906&r2=1584907&view=diff ============================================================================== --- subversion/trunk/subversion/svnserve/serve.c (original) +++ subversion/trunk/subversion/svnserve/serve.c Fri Apr 4 21:03:20 2014 @@ -2868,9 +2868,10 @@ static svn_error_t *lock_many(svn_ra_svn /* No result? Something really odd happened, create a placeholder error so that any other results can be reported in the correct order. */ - result = apr_palloc(subpool, sizeof(struct lock_result_t)); + result = apr_palloc(pool, sizeof(struct lock_result_t)); result->err = svn_error_createf(SVN_ERR_FS_LOCK_OPERATION_FAILED, 0, _("No result for '%s'."), path); + svn_hash_sets(lmb.results, full_path, result); } if (result->err) @@ -3037,9 +3038,10 @@ static svn_error_t *unlock_many(svn_ra_s /* No result? Something really odd happened, create a placeholder error so that any other results can be reported in the correct order. */ - result = apr_palloc(subpool, sizeof(struct lock_result_t)); + result = apr_palloc(pool, sizeof(struct lock_result_t)); result->err = svn_error_createf(SVN_ERR_FS_LOCK_OPERATION_FAILED, 0, _("No result for '%s'."), path); + svn_hash_sets(lmb.results, full_path, result); } if (result->err)