commit 681f82fd7662a77e4a8a44bcbf89099e0831c857
author Evgeny Kotkov <kotkov@apache.org> Tue Feb 23 17:08:35 2021 +0000
committer Evgeny Kotkov <kotkov@apache.org> Tue Feb 23 17:08:35 2021 +0000
tree d847a900201ef8a7f19bfd0b34a97b3c64e0d5e7
parent 929df881592b491ad7221a8b10872f7f33a1ef62

* subversion/libsvn_wc/working_file_writer.c
  (svn_wc__working_file_writer_close): Kill the pool cleanup handler if the
   caller has closed the writer explicitly — no reason to keep the handler
   in the cleanup list if it's no-op.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1886845 13f79535-47bb-0310-9956-ffa450edef68

subversion/libsvn_wc/working_file_writer.c

diff --git a/subversion/libsvn_wc/working_file_writer.c b/subversion/libsvn_wc/working_file_writer.c
index a64d521..d13b3a2 100644
--- a/subversion/libsvn_wc/working_file_writer.c
+++ b/subversion/libsvn_wc/working_file_writer.c
@@ -187,6 +187,7 @@
       /* Do not retry deleting if it fails, as the stream may already
          be in an invalid state. */
       writer->install_stream = NULL;
+      apr_pool_cleanup_kill(writer->pool, writer, cleanup_file_writer);
       SVN_ERR(svn_stream__install_delete(stream, writer->pool));
     }