drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "accept close() on database objects even if the database is closed" into froyo

Browse Source
This commit is contained in:
Vasu Nori
2010-04-16 14:48:47 -07:00
committed by Android (Google) Code Review
parent d5a873fbe8 0dbb9cee58
commit 1fc46c623f
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/database/sqlite/SQLiteCompiledSql.java
View File

@ -96,9 +96,6 @@ import android.util.Log;
} }
/* package */ void releaseSqlStatement() { /* package */ void releaseSqlStatement() {
if (!mDatabase.isOpen()) {
throw new IllegalStateException("database " + mDatabase.getPath() + " already closed");
}
// Note that native_finalize() checks to make sure that nStatement is // Note that native_finalize() checks to make sure that nStatement is
// non-null before destroying it. // non-null before destroying it.
if (nStatement != 0) { if (nStatement != 0) {

2
core/java/android/database/sqlite/SQLiteProgram.java
View File

@ -286,7 +286,7 @@ public abstract class SQLiteProgram extends SQLiteClosable {
*/ */
public void close() { public void close() {
if (!mDatabase.isOpen()) { if (!mDatabase.isOpen()) {
throw new IllegalStateException("database " + mDatabase.getPath() + " already closed"); return;
} }
mDatabase.lock(); mDatabase.lock();
try { try {