Re: svn commit: r1664078 - in /subversion/trunk/subversion: include/private/ libsvn_ra/ libsvn_ra_local/ libsvn_ra_serf/ libsvn_ra_svn/ libsvn_subr/

[Philip Martin <ph...@wandisco.com>]

rhuijben@apache.org writes:

> Author: rhuijben
> Date: Wed Mar  4 17:23:46 2015
> New Revision: 1664078
>
> URL: http://svn.apache.org/r1664078
> Log:
> Following up on r1609499, which made all ra layers change the auth baton in a
> way that affects all ra session using it, make it possible to create a slave
> auth baton that shares everything with the parent baton except for the
> parameters.

> +                             callbacks, callback_baton, auth_baton,
> +                             config, sesspool, scratch_pool);
>  
>    if (err)
>      {
> +      svn_pool_clear(scratch_pool);

As this path always returns an error I think it would be clearer to
destroy the temporary pool rather than clear it.  I think it should be
the parent sesspool rather than scratch_pool, as in the other error
paths.

>        if (err->apr_err == SVN_ERR_RA_SESSION_URL_MISMATCH)
>          return svn_error_trace(err);
>  
> @@ -398,7 +406,7 @@ svn_error_t *svn_ra_open4(svn_ra_session
>      {
>        /* *session_p = NULL; */
>        *corrected_url_p = apr_pstrdup(pool, *corrected_url_p);
> -      svn_pool_destroy(sesspool);
> +      svn_pool_destroy(sesspool); /* Includes scratch_pool */
>        return SVN_NO_ERROR;
>      }

-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*

Re: svn commit: r1664078 - in /subversion/trunk/subversion: include/private/ libsvn_ra/ libsvn_ra_local/ libsvn_ra_serf/ libsvn_ra_svn/ libsvn_subr/

[Philip Martin <ph...@wandisco.com>]

Philip Martin <ph...@wandisco.com> writes:

>>    if (err)
>>      {
>> +      svn_pool_clear(scratch_pool);
>
> As this path always returns an error I think it would be clearer to
> destroy the temporary pool rather than clear it.  I think it should be
> the parent sesspool rather than scratch_pool, as in the other error
> paths.

I've changed this in r1664344.

-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*