From 9efa638bec6d135464ff9b3bab358c76671c87bf Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Tue, 27 May 2014 04:55:31 +0000
Subject: Vendor import svn-1.8.9

---
 subversion/libsvn_wc/wc_db_wcroot.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'subversion/libsvn_wc/wc_db_wcroot.c')

diff --git a/subversion/libsvn_wc/wc_db_wcroot.c b/subversion/libsvn_wc/wc_db_wcroot.c
index 21173e5..d801451 100644
--- a/subversion/libsvn_wc/wc_db_wcroot.c
+++ b/subversion/libsvn_wc/wc_db_wcroot.c
@@ -690,8 +690,12 @@ try_symlink_as_dir:
           svn_error_clear(err);
           *wcroot = NULL;
         }
-      else
-        SVN_ERR(err);
+      else if (err)
+        {
+          /* Close handle if we are not going to use it to support
+             upgrading with exclusive wc locking. */
+          return svn_error_compose_create(err, svn_sqlite__close(sdb));
+        }
     }
   else
     {
-- 
cgit v1.1