svn commit: r1806018 - /subversion/trunk/subversion/mod_dav_svn/merge.c

[kotkov]

Author: kotkov
Date: Thu Aug 24 09:47:00 2017
New Revision: 1806018

URL: http://svn.apache.org/viewvc?rev=1806018&view=rev
Log:
* subversion/mod_dav_svn/merge.c
  (do_resources): Avoid calling svn_fs_check_path() when we have the
   node kind available in the svn_fs_path_change3_t.

Modified:
    subversion/trunk/subversion/mod_dav_svn/merge.c

Modified: subversion/trunk/subversion/mod_dav_svn/merge.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/merge.c?rev=1806018&r1=1806017&r2=1806018&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/merge.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/merge.c Thu Aug 24 09:47:00 2017
@@ -171,7 +171,12 @@ do_resources(const dav_svn_repos *repos,
           if (! apr_hash_get(sent, path, change->path.len))
             {
               svn_node_kind_t kind;
-              SVN_ERR(svn_fs_check_path(&kind, root, path, iterpool));
+
+              if (change->node_kind == svn_node_unknown)
+                SVN_ERR(svn_fs_check_path(&kind, root, path, iterpool));
+              else
+                kind = change->node_kind;
+
               SVN_ERR(send_response(repos, root, change->path.data,
                                     kind == svn_node_dir,
                                     output, bb, iterpool));