svn commit: r1726376 - /subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c

[st...@apache.org]

Author: stefan2
Date: Sat Jan 23 11:03:27 2016
New Revision: 1726376

URL: http://svn.apache.org/viewvc?rev=1726376&view=rev
Log:
Follow-up on r1726004:
Make sure to always set the OOD info in FSX.

* subversion/libsvn_fs_x/temp_serializer.c
  (svn_fs_x__extract_dir_entry): This function has an early-out code path,
                                 so we must set the OOD field earlier.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c

Modified: subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c?rev=1726376&r1=1726375&r2=1726376&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c Sat Jan 23 11:03:27 2016
@@ -839,6 +839,10 @@ svn_fs_x__extract_dir_entry(void **out,
   const apr_uint32_t *lengths =
     svn_temp_deserializer__ptr(data, (const void *const *)&dir_data->lengths);
 
+  /* Before we return, make sure we tell the caller this data is even still
+     relevant. */
+  b->out_of_date = dir_data->txn_filesize != b->txn_filesize;
+
   /* Special case: Early out for empty directories.
      That simplifies tests further down the road. */
   *out = NULL;
@@ -867,8 +871,6 @@ svn_fs_x__extract_dir_entry(void **out,
 
   /* de-serialize that entry or return NULL, if no match has been found.
    * Be sure to check that the directory contents is still up-to-date. */
-  b->out_of_date = dir_data->txn_filesize != b->txn_filesize;
-
   if (found && !b->out_of_date)
     {
       const svn_fs_x__dirent_t *source =