svn commit: r1575436 - /subversion/trunk/subversion/libsvn_fs_fs/cached_data.c

[st...@apache.org]

Author: stefan2
Date: Fri Mar  7 22:34:05 2014
New Revision: 1575436

URL: http://svn.apache.org/r1575436
Log:
* subversion/libsvn_fs_fs/cached_data.c
  (read_delta_window): Handle a cache configuration edge case more nicely.
                       When txdelta caching is off, don't attempt to
                       prefetch (mainly txdelta window) data.

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/cached_data.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/cached_data.c?rev=1575436&r1=1575435&r2=1575436&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/cached_data.c Fri Mar  7 22:34:05 2014
@@ -1357,7 +1357,8 @@ read_delta_window(svn_txdelta_window_t *
      because the block is unlikely to contain other data. */
   if (   rs->chunk_index == 0
       && SVN_IS_VALID_REVNUM(rs->revision)
-      && svn_fs_fs__use_log_addressing(rs->sfile->fs, rs->revision))
+      && svn_fs_fs__use_log_addressing(rs->sfile->fs, rs->revision)
+      && rs->window_cache)
     {
       SVN_ERR(block_read(NULL, rs->sfile->fs, rs->revision, rs->item_index,
                          rs->sfile->rfile, pool, pool));