Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RESOLVED - issue BATCH-1389: Thread safety in *PagingReader

Browse Source 
No need for AtomicInteger now that we are all synchronized.
This commit is contained in:
dsyer
2009-09-04 14:42:20 +00:00
parent a4881dfe66
commit de7df3ef21
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractPagingItemReader.java
View File

@@ -16,7 +16,6 @@
package org.springframework.batch.item.database; package org.springframework.batch.item.database;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@@ -46,7 +45,7 @@ public abstract class AbstractPagingItemReader<T> extends AbstractItemCountingIt
private int pageSize = 10; private int pageSize = 10;
private volatile AtomicInteger current = new AtomicInteger(0); private volatile int current = 0;
private volatile int page = 0; private volatile int page = 0;
@@ -96,7 +95,7 @@ public abstract class AbstractPagingItemReader<T> extends AbstractItemCountingIt
synchronized (lock) { synchronized (lock) {
if (results == null || current.get() >= pageSize) { if (results == null || current >= pageSize) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Reading page " + getPage()); logger.debug("Reading page " + getPage());
@@ -104,13 +103,13 @@ public abstract class AbstractPagingItemReader<T> extends AbstractItemCountingIt
doReadPage(); doReadPage();
page++; page++;
if (current.get() >= pageSize) { if (current >= pageSize) {
current.set(0); current = 0;
} }
} }
int next = current.getAndIncrement(); int next = current++;
if (next < results.size()) { if (next < results.size()) {
return results.get(next); return results.get(next);
} }
@@ -136,7 +135,7 @@ public abstract class AbstractPagingItemReader<T> extends AbstractItemCountingIt
protected void doClose() throws Exception { protected void doClose() throws Exception {
initialized = false; initialized = false;
current.set(0); current = 0;
page = 0; page = 0;
results = null; results = null;
@@ -147,7 +146,7 @@ public abstract class AbstractPagingItemReader<T> extends AbstractItemCountingIt
synchronized (lock) { synchronized (lock) {
page = itemIndex / pageSize; page = itemIndex / pageSize;
current.set(itemIndex % pageSize); current = itemIndex % pageSize;
} }
doJumpToPage(itemIndex); doJumpToPage(itemIndex);