From de7df3ef21f6b2ec0a55e7dbe4e14d7eef67bfbc Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Fri, 4 Sep 2009 14:42:20 +0000
Subject: [PATCH] RESOLVED - issue BATCH-1389: Thread safety in *PagingReader
 No need for AtomicInteger now that we are all synchronized.

---
 .../item/database/AbstractPagingItemReader.java   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

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