svn commit: r1659868 - /subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c

[rhuijben]

Author: rhuijben
Date: Sat Feb 14 23:00:44 2015
New Revision: 1659868

URL: http://svn.apache.org/r1659868
Log:
* subversion/libsvn_ra_local/ra_plugin.c
  (commit_callback_wrapper): Following up on r1659863, use ra local specific
    api, add error tracing and rename pool to scratch pool.

Modified:
    subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c

Modified: subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c?rev=1659868&r1=1659867&r2=1659868&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c Sat Feb 14 23:00:44 
2015
@@ -803,15 +803,16 @@ struct ccw_baton
 static svn_error_t *
 commit_callback_wrapper(const svn_commit_info_t *commit_info,
                         void *baton,
-                        apr_pool_t *pool)
+                        apr_pool_t *scratch_pool)
 {
   struct ccw_baton *ccwb = baton;
-  svn_commit_info_t *ci = svn_commit_info_dup(commit_info, pool);
+  svn_commit_info_t *ci = svn_commit_info_dup(commit_info, scratch_pool);
 
-  /* On RA-local it is safe to get this value in a callback :-) */
-  SVN_ERR(svn_ra_get_repos_root2(ccwb->session, &ci->repos_root, pool));
+  SVN_ERR(svn_ra_local__get_repos_root(ccwb->session, &ci->repos_root,
+                                       scratch_pool));
 
-  return ccwb->original_callback(ci, ccwb->original_baton, pool);
+  return svn_error_trace(ccwb->original_callback(ci, ccwb->original_baton,
+                                                 scratch_pool));
 }