svn commit: r1439477 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[st...@apache.org]

Author: stsp
Date: Mon Jan 28 16:22:00 2013
New Revision: 1439477

URL: http://svn.apache.org/viewvc?rev=1439477&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_bump_format): Don't forget to close sdb in case the
   svn_wc__upgrade_sdb() function returns an error.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1439477&r1=1439476&r2=1439477&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Jan 28 16:22:00 2013
@@ -14239,6 +14239,7 @@ svn_wc__db_bump_format(int *result_forma
 {
   svn_sqlite__db_t *sdb;
   svn_error_t *err;
+  svn_error_t *upgrade_err;
   int format;
 
   /* Do not scan upwards for a working copy root here to prevent accidental
@@ -14274,11 +14275,11 @@ svn_wc__db_bump_format(int *result_forma
     }
 
   SVN_ERR(svn_sqlite__read_schema_version(&format, sdb, scratch_pool));
-  SVN_ERR(svn_wc__upgrade_sdb(result_format, wcroot_abspath,
-                              sdb, format, scratch_pool));
-  SVN_ERR(svn_sqlite__close(sdb));
+  upgrade_err = svn_wc__upgrade_sdb(result_format, wcroot_abspath,
+                                     sdb, format, scratch_pool);
+  err = svn_sqlite__close(sdb);
 
-  return SVN_NO_ERROR;
+  return svn_error_compose_create(upgrade_err, err);
 }
 
 svn_error_t *