Merge "NullPointerException in SQLiteSession"

2013-02-07 04:43:00 +00:00
parent b9185fd1ff 0b6cc9ace4
commit d2bec0960d
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/database/sqlite/SQLiteSession.java
+++ b/core/java/android/database/sqlite/SQLiteSession.java
@@ -926,7 +926,7 @@ public final class SQLiteSession {
    }

    private void throwIfNestedTransaction() {
-        if (mTransactionStack == null && mTransactionStack.mParent != null) {
+        if (hasNestedTransaction()) {
            throw new IllegalStateException("Cannot perform this operation because "
                    + "a nested transaction is in progress.");
        }