Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: sql/connection.cc

Issue 17726002: [sql] Callback and scoped-ignore tests for sql::Statement. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: prevent nesting, TODO. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sql/connection.h ('k') | sql/connection_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sql/connection.cc
diff --git a/sql/connection.cc b/sql/connection.cc
index f04eb3bd7ee3c135892fd9225043e59fdcaf6eed..06dc8889dad075aa819b067edc18f0b8b41108bb 100644
--- a/sql/connection.cc
+++ b/sql/connection.cc
@@ -860,7 +860,10 @@ int Connection::OnSqliteError(int err, sql::Statement *stmt) {
<< ": " << GetErrorMessage();
if (!error_callback_.is_null()) {
- error_callback_.Run(err, stmt);
+ // Fire from a copy of the callback in case of reentry into
+ // re/set_error_callback().
+ // TODO(shess): <http://crbug.com/254584>
+ ErrorCallback(error_callback_).Run(err, stmt);
return err;
}
« no previous file with comments | « sql/connection.h ('k') | sql/connection_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698