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

Merge change Ib1dd3235 into eclair-mr2

Browse Source 
* changes:
  fix NPE. don't release an already released compiledSql obj
This commit is contained in:
Android (Google) Code Review
2009-12-01 14:24:52 -08:00
parent 03cb1f15ca b1dd3235a9
commit 1533aed6d9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ public abstract class SQLiteProgram extends SQLiteClosable {
@Override
protected void onAllReferencesReleased() {
// release the compiled sql statement used by me if it is NOT in cache
if (!myCompiledSqlIsInCache) {
if (!myCompiledSqlIsInCache && compiledSql != null) {
compiledSql.releaseSqlStatement();
compiledSql = null; // so that GC doesn't call finalize() on it
}
@@ -87,7 +87,7 @@ public abstract class SQLiteProgram extends SQLiteClosable {
@Override
protected void onAllReferencesReleasedFromContainer() {
// release the compiled sql statement used by me if it is NOT in cache
if (!myCompiledSqlIsInCache) {
if (!myCompiledSqlIsInCache && compiledSql != null) {
compiledSql.releaseSqlStatement();
compiledSql = null; // so that GC doesn't call finalize() on it
}