subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1584907 - /subversion/trunk/subversion/svnserve/serve.c
Date Fri, 04 Apr 2014 21:03:20 GMT
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)



Mime
View raw message