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

[ph...@apache.org]

Author: philip
Date: Fri Apr  1 17:26:51 2011
New Revision: 1087823

URL: http://svn.apache.org/viewvc?rev=1087823&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (read_all_tree_conflicts, read_tree_conflict): Reset SQLite statement.

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=1087823&r1=1087822&r2=1087823&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Apr  1 17:26:51 2011
@@ -3812,6 +3812,8 @@ read_all_tree_conflicts(apr_hash_t **tre
       SVN_ERR(svn_sqlite__step(&have_row, stmt));
     }
 
+  SVN_ERR(svn_sqlite__reset(stmt));
+
   svn_pool_destroy(iterpool);
 
   return SVN_NO_ERROR;
@@ -3867,7 +3869,7 @@ read_tree_conflict(const svn_wc_conflict
   SVN_ERR(svn_sqlite__step(&have_row, stmt));
 
   if (!have_row)
-    return SVN_NO_ERROR;
+    return svn_error_return(svn_sqlite__reset(stmt));
 
   conflict_data = svn_sqlite__column_text(stmt, 0, NULL);
   skel = svn_skel__parse(conflict_data, strlen(conflict_data), scratch_pool);