You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/04/11 05:56:02 UTC
svn commit: r1586552 -
/subversion/branches/thunder/subversion/libsvn_fs_fs/cached_data.c
Author: stefan2
Date: Fri Apr 11 03:56:02 2014
New Revision: 1586552
URL: http://svn.apache.org/r1586552
Log:
On the thunder branch: Follow-up to r1586544.
* subversion/libsvn_fs_fs/cached_data.c
(svn_fs_fs__rep_contents_dir): Only use fully initialized variables.
Modified:
subversion/branches/thunder/subversion/libsvn_fs_fs/cached_data.c
Modified: subversion/branches/thunder/subversion/libsvn_fs_fs/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/branches/thunder/subversion/libsvn_fs_fs/cached_data.c?rev=1586552&r1=1586551&r2=1586552&view=diff
==============================================================================
--- subversion/branches/thunder/subversion/libsvn_fs_fs/cached_data.c (original)
+++ subversion/branches/thunder/subversion/libsvn_fs_fs/cached_data.c Fri Apr 11 03:56:02 2014
@@ -2291,8 +2291,8 @@ svn_fs_fs__rep_contents_dir(apr_array_he
SVN_ERR(svn_fs_fs__thundered_cache_get((void **)entries_p, &found,
&access, fs, "DIR",
- noderev->data_rep->revision,
- noderev->data_rep->item_index,
+ pair_key.revision,
+ pair_key.second,
cache, key, result_pool));
if (found)
return SVN_NO_ERROR;
@@ -2304,10 +2304,12 @@ svn_fs_fs__rep_contents_dir(apr_array_he
/* Update the cache, if we are to use one. */
if (cache)
- SVN_ERR(svn_cache__set(cache, key, *entries_p, scratch_pool));
+ {
+ SVN_ERR(svn_cache__set(cache, key, *entries_p, scratch_pool));
- /* Others may now retry the cache lookup */
- SVN_ERR(svn_fs__thunder_end_access(access));
+ /* Others may now retry the cache lookup */
+ SVN_ERR(svn_fs__thunder_end_access(access));
+ }
return SVN_NO_ERROR;
}