diff options
| author | Jeffrey Brown <jeffbrown@android.com> | 2013-02-06 22:06:18 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-06 22:06:18 -0800 |
| commit | e24c67e32258bfedafbc2dc2861d4358950131f0 (patch) | |
| tree | 30ae8387955e415014f005f66d7397342fe6d8c0 /core/java/android/database | |
| parent | 6b7fcc8f6754f0bf7a406834a6dc066710a9de51 (diff) | |
| parent | 2990ed7a3bf7314bbd4d98161fbcdcf48098052c (diff) | |
| download | frameworks_base-e24c67e32258bfedafbc2dc2861d4358950131f0.zip frameworks_base-e24c67e32258bfedafbc2dc2861d4358950131f0.tar.gz frameworks_base-e24c67e32258bfedafbc2dc2861d4358950131f0.tar.bz2 | |
am 2990ed7a: am 3c6ee5b5: am d2bec096: Merge "NullPointerException in SQLiteSession"
# By László Dávid
# Via Android Git Automerger (2) and others
* commit '2990ed7a3bf7314bbd4d98161fbcdcf48098052c':
NullPointerException in SQLiteSession
Diffstat (limited to 'core/java/android/database')
| -rw-r--r-- | core/java/android/database/sqlite/SQLiteSession.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/database/sqlite/SQLiteSession.java b/core/java/android/database/sqlite/SQLiteSession.java index beb5b3a..d80ab1f 100644 --- 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."); } |