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

[rhuijben]

Author: rhuijben
Date: Mon Mar 21 15:02:27 2011
New Revision: 1083817

URL: http://svn.apache.org/viewvc?rev=1083817&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_read_conflicts): Reset statement on 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=1083817&r1=1083816&r2=1083817&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Mar 21 15:02:27 2011
@@ -8189,12 +8189,17 @@ svn_wc__db_read_conflicts(const apr_arra
         {
           const svn_wc_conflict_description2_t *desc;
           const svn_skel_t *skel;
+          svn_error_t *err;
 
           skel = svn_skel__parse(conflict_data, strlen(conflict_data),
                                  scratch_pool);
-          SVN_ERR(svn_wc__deserialize_conflict(&desc, skel,
+          err = svn_wc__deserialize_conflict(&desc, skel,
                           svn_dirent_dirname(local_abspath, scratch_pool),
-                          result_pool, scratch_pool));
+                          result_pool, scratch_pool);
+
+          if (err)
+            SVN_ERR(svn_error_compose_create(err,
+                                             svn_sqlite__reset(stmt)));
 
           APR_ARRAY_PUSH(cflcts, const svn_wc_conflict_description2_t *) = 
desc;
         }