commit 1a2344b8b2c374cb32ff4af020666e6910ff2a8f
author Jean-Baptiste Queru <jbq@google.com> Wed Nov 17 17:16:06 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 17 17:16:06 2010 -0800
tree 23794919adf7ff1946e618a6ac319517cc8cb094
parent 7ee427714d4621bd9a0b15364a073aff60ebf20c
parent 09e50cdbc62938b178f4c9a66b3cec8a466daaa8

am 09e50cdb: Merge "Reorder lock acquision vs try."

* commit '09e50cdbc62938b178f4c9a66b3cec8a466daaa8':
  Reorder lock acquision vs try.

core/java/android/database/sqlite/SQLiteCursor.java

diff --git a/core/java/android/database/sqlite/SQLiteCursor.java b/core/java/android/database/sqlite/SQLiteCursor.java
index d8dcaf7..c592134 100644
--- a/core/java/android/database/sqlite/SQLiteCursor.java
+++ b/core/java/android/database/sqlite/SQLiteCursor.java
@@ -132,11 +132,11 @@
             // the cursor's state doesn't change
             while (true) {
                 mLock.lock();
-                if (mCursorState != mThreadState) {
-                    mLock.unlock();
-                    break;
-                }
                 try {
+                    if (mCursorState != mThreadState) {
+                        break;
+                    }
+
                     int count = mQuery.fillWindow(cw, mMaxRead, mCount);
                     // return -1 means not finished
                     if (count != 0) {
@@ -218,9 +218,8 @@
         mColumnNameMap = null;
         mQuery = query;
 
+        db.lock();
         try {
-            db.lock();
-
             // Setup the list of columns
             int columnCount = mQuery.columnCountLocked();
             mColumns = new String[columnCount];