| Chunk |
|---|
| Conflicting content |
|---|
while (true) {
mLock.lock();
try {
<<<<<<< HEAD
int count = getQuery().fillWindow(cw, mMaxRead, mCount);
// return -1 means there is still more data to be retrieved from the resultset
=======
if (mCursorState != mThreadState) {
break;
}
int count = mQuery.fillWindow(cw, mMaxRead, mCount);
// return -1 means not finished
>>>>>>> 1a2344b8b2c374cb32ff4af020666e6910ff2a8f
if (count != 0) {
if (count == NO_COUNT){
mCount += mMaxRead; |
| Solution content |
|---|
while (true) {
mLock.lock();
try {
if (mCursorState != mThreadState) {
break;
}
int count = getQuery().fillWindow(cw, mMaxRead, mCount);
// return -1 means there is still more data to be retrieved from the resultset
if (count != 0) {
if (count == NO_COUNT){
mCount += mMaxRead; |
| File |
|---|
| SQLiteCursor.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
db.lock();
try {
<<<<<<< HEAD
query.mDatabase.lock();
=======
>>>>>>> 1a2344b8b2c374cb32ff4af020666e6910ff2a8f
// Setup the list of columns
int columnCount = mQuery.columnCountLocked();
mColumns = new String[columnCount]; |
| Solution content |
|---|
query.mDatabase.lock();
try {
// Setup the list of columns
int columnCount = mQuery.columnCountLocked();
mColumns = new String[columnCount]; |
| File |
|---|
| SQLiteCursor.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |