commit 78f307d229466bb41c0260d1092dcea82a7bb5f8
author Vasu Nori <vnori@google.com> Fri Mar 05 22:12:51 2010 -0800
committer Vasu Nori <vnori@google.com> Fri Mar 05 22:12:51 2010 -0800
tree cc3ad99d8856810bf9ee37dc36dad6c6c2af9450
parent c48aff6531834d8366027d32be22e6e40b976eec

rollback AFTER commit causes warning message from sqlite bug:2486731

core/jni/android_database_SQLiteDatabase.cpp

diff --git a/core/jni/android_database_SQLiteDatabase.cpp b/core/jni/android_database_SQLiteDatabase.cpp
index bd55e83..44e091d 100644
--- a/core/jni/android_database_SQLiteDatabase.cpp
+++ b/core/jni/android_database_SQLiteDatabase.cpp
@@ -367,7 +367,7 @@
     if (err != SQLITE_OK) {
         LOGE("register_localized_collators() failed setting locale\n");
         throw_sqlite3_exception(env, handle);
-        goto done;
+        goto rollback;
     }
 
     err = sqlite3_exec(handle, "DELETE FROM " ANDROID_TABLE, NULL, NULL, NULL);
@@ -415,7 +415,9 @@
     }
 
 rollback:
-    sqlite3_exec(handle, "ROLLBACK TRANSACTION", NULL, NULL, NULL);
+    if (err != SQLITE_OK) {
+        sqlite3_exec(handle, "ROLLBACK TRANSACTION", NULL, NULL, NULL);
+    }
 
 done:
     if (locale8 != NULL) env->ReleaseStringUTFChars(localeString, locale8);