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

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

Browse Source 
* commit '09e50cdbc62938b178f4c9a66b3cec8a466daaa8':
  Reorder lock acquision vs try.
This commit is contained in:
Jean-Baptiste Queru
2010-11-17 17:16:06 -08:00
committed by Android Git Automerger
parent 7ee427714d 09e50cdbc6
commit 1a2344b8b2
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/database/sqlite/SQLiteCursor.java
View File

@@ -132,11 +132,11 @@ public class SQLiteCursor extends AbstractWindowedCursor {
// 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 @@ public class SQLiteCursor extends AbstractWindowedCursor {
mColumnNameMap = null;
mQuery = query;
db.lock();
try {
db.lock();
// Setup the list of columns
int columnCount = mQuery.columnCountLocked();
mColumns = new String[columnCount];