From 598301de8d474a8072f9c855a655451c9e17ee1c Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Sat, 27 Feb 2010 13:51:17 +0000
Subject: [PATCH] RESOLVED - issue BATCH-1513: HibernateItemReaderHelper
 requires queryProvider field to be an instance of
 AbstractHibernateQueryProvider

---
 .../batch/item/database/HibernateItemReaderHelper.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java
index 9e32b3e4a..71c6a924b 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java
@@ -25,7 +25,6 @@ import org.hibernate.ScrollableResults;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.StatelessSession;
-import org.springframework.batch.item.database.orm.AbstractHibernateQueryProvider;
 import org.springframework.batch.item.database.orm.HibernateQueryProvider;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
@@ -106,8 +105,7 @@ public class HibernateItemReaderHelper<T> implements InitializingBean {
 		}
 		// making sure that the appropriate (Hibernate) query provider is set
 		else {
-			Assert.state(queryProvider instanceof AbstractHibernateQueryProvider,
-					"Hibernate query provider must be set");
+			Assert.state(queryProvider != null, "Hibernate query provider must be set");
 		}
 
 	}
@@ -134,8 +132,8 @@ public class HibernateItemReaderHelper<T> implements InitializingBean {
 	public Query createQuery() {
 
 		if (useStatelessSession) {
-			if (statelessSession==null) {
-				statelessSession = sessionFactory.openStatelessSession();				
+			if (statelessSession == null) {
+				statelessSession = sessionFactory.openStatelessSession();
 			}
 			if (queryProvider != null) {
 				queryProvider.setStatelessSession(statelessSession);
@@ -150,7 +148,7 @@ public class HibernateItemReaderHelper<T> implements InitializingBean {
 			}
 		}
 		else {
-			if (statefulSession==null) {				
+			if (statefulSession == null) {
 				statefulSession = sessionFactory.openSession();
 			}
 			if (queryProvider != null) {