You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ko...@apache.org on 2016/04/27 12:46:32 UTC
svn commit: r1741214 - /subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c
Author: kotkov
Date: Wed Apr 27 10:46:32 2016
New Revision: 1741214
URL: http://svn.apache.org/viewvc?rev=1741214&view=rev
Log:
Don't leave an unreset sqlite statement if we fail to fix up the expanded
size of a representation.
* subversion/libsvn_fs_fs/rep-cache.c
(svn_fs_fs__get_rep_reference): Call svn_sqlite__reset() before trying
to fix up the representation's expanded size.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c?rev=1741214&r1=1741213&r2=1741214&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c Wed Apr 27 10:46:32 2016
@@ -296,8 +296,6 @@ svn_fs_fs__get_rep_reference(representat
(*rep)->item_index = svn_sqlite__column_int64(stmt, 1);
(*rep)->size = svn_sqlite__column_int64(stmt, 2);
(*rep)->expanded_size = svn_sqlite__column_int64(stmt, 3);
-
- SVN_ERR(svn_fs_fs__fixup_expanded_size(fs, *rep, pool));
}
else
*rep = NULL;
@@ -306,9 +304,12 @@ svn_fs_fs__get_rep_reference(representat
if (*rep)
{
+ svn_error_t *err;
+
+ SVN_ERR(svn_fs_fs__fixup_expanded_size(fs, *rep, pool));
+
/* Check that REP refers to a revision that exists in FS. */
- svn_error_t *err = svn_fs_fs__ensure_revision_exists((*rep)->revision,
- fs, pool);
+ err = svn_fs_fs__ensure_revision_exists((*rep)->revision, fs, pool);
if (err)
return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
"Checksum '%s' in rep-cache is beyond HEAD",