Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: neutral (athena.apache.org: local policy)
From: "Bert Huijben" <bert@qqmail.nl>
To: <dev@subversion.apache.org>,
	<philip@apache.org>
References: <20120823110855.5738923888E4@eris.apache.org>
In-Reply-To: <20120823110855.5738923888E4@eris.apache.org>
Subject: RE: svn commit: r1376436 -
 /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Date: Thu, 23 Aug 2012 15:21:55 +0200
Message-ID: <006c01cd8132$44cf32f0$ce6d98d0$@qqmail.nl>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Content-Language: nl
Thread-Index: AQLU5skx8oF3czWQ3ZA2cJVR+Ks/s5VYlqOg


> -----Original Message-----
> From: philip@apache.org [mailto:philip@apache.org]
> Sent: donderdag 23 augustus 2012 13:09
> To: commits@subversion.apache.org
> Subject: svn commit: r1376436 -
> /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
>=20
> Author: philip
> Date: Thu Aug 23 11:08:54 2012
> New Revision: 1376436
>=20
> URL: http://svn.apache.org/viewvc?rev=3D1376436&view=3Drev
> Log:
> Fix issue 4220, revprop packing post-commit breaks commit.
>=20
> * subversion/libsvn_fs_fs/fs_fs.c
>   (get_revision_proplist): Fall through to packed if possible.
>=20
> Modified:
>     subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
>=20
> Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
> URL:
> =
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs
> _fs.c?rev=3D1376436&r1=3D1376435&r2=3D1376436&view=3Ddiff
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
> +++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Thu Aug 23 =
11:08:54
> 2012
> @@ -3681,8 +3681,18 @@ get_revision_proplist(apr_hash_t **propl
>     * non-packed shard.  If that fails, we will fall through to packed
>     * shard reads. */
>    if (!is_packed_revprop(fs, rev))
> -    SVN_ERR(read_non_packed_revprop(proplist_p, fs, rev, generation,
> -                                    pool));
> +    {
> +      svn_error_t *err =3D read_non_packed_revprop(proplist_p, fs, =
rev,
> +                                                 generation, pool);
> +      if (err)
> +        {
> +          if (!APR_STATUS_IS_ENOENT(err->apr_err)
> +              || ffd->format < SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
> +            return svn_error_trace(err);
> +
> +          svn_error_clear(err);

Are the output arguments of read_no_packed_revprop guaranteed (or =
unused) after this error clear + fall through?

	Bert

> +        }
> +    }
>=20
>    /* if revprop packing is available and we have not read the =
revprops, yet,
>     * try reading them from a packed shard.  If that fails, REV is =
most
>=20