You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2014/02/26 14:15:34 UTC

svn commit: r1572041 - /subversion/branches/fsfs-lock-many/subversion/libsvn_repos/fs-wrap.c

Author: philip
Date: Wed Feb 26 13:15:34 2014
New Revision: 1572041

URL: http://svn.apache.org/r1572041
Log:
On the fsfs-lock-many branch: fix dual pool use bug.

* subversion/libsvn_repos/fs-wrap.c
  (svn_repos_fs_lock2,
   svn_repos_fs_unlock2): Pass pools in correct order.

Modified:
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/fs-wrap.c

Modified: subversion/branches/fsfs-lock-many/subversion/libsvn_repos/fs-wrap.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/libsvn_repos/fs-wrap.c?rev=1572041&r1=1572040&r2=1572041&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/libsvn_repos/fs-wrap.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/libsvn_repos/fs-wrap.c Wed Feb 26 13:15:34 2014
@@ -565,7 +565,7 @@ svn_repos_fs_lock2(apr_hash_t **results,
 
   err = svn_fs_lock2(&pre_results, repos->fs, pre_targets, comment,
                      is_dav_comment, expiration_date, steal_lock,
-                     iterpool, result_pool);
+                     result_pool, iterpool);
 
   /* Combine results so the caller can handle all the errors. */
   for (hi = apr_hash_first(iterpool, pre_results); hi; hi = apr_hash_next(hi))
@@ -698,7 +698,7 @@ svn_repos_fs_unlock2(apr_hash_t **result
     }
 
   err = svn_fs_unlock2(&pre_results, repos->fs, pre_targets, break_lock,
-                       iterpool, result_pool);
+                       result_pool, iterpool);
 
   /* Combine results for all paths. */
   for (hi = apr_hash_first(iterpool, pre_results); hi; hi = apr_hash_next(hi))