Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rollback AFTER commit causes warning message from sqlite bug:2486731

Browse Source
This commit is contained in:
Vasu Nori
2010-03-05 22:12:51 -08:00
parent c48aff6531
commit 78f307d229
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android_database_SQLiteDatabase.cpp
View File

@@ -367,7 +367,7 @@ static void native_setLocale(JNIEnv* env, jobject object, jstring localeString,
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 @@ static void native_setLocale(JNIEnv* env, jobject object, jstring localeString,
}
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);