Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1533aed6 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change Ib1dd3235 into eclair-mr2 

* changes:
  fix NPE. don't release an already released compiledSql obj
parents 03cb1f15 b1dd3235

core/java/android/database/sqlite/SQLiteProgram.java

+2 −2
Original line number Diff line number Diff line
@@ -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

        }