Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

BATCH-1946: Signs of failed merge in HibernateItemWrite (and others?)

  • Loading branch information...
commit 36919f8706e430127c03a81b1f5b5de212a9e635 1 parent 5d88e03
@chrisjs chrisjs authored mminella committed
View
13 spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemWriter.java
@@ -35,13 +35,6 @@
* default (see {@link #setClearSession(boolean) clearSession} property).<br/>
* <br/>
*
-<<<<<<< HEAD
- * The writer is thread safe after its properties are set (normal singleton
- * behavior), so it can be used to write in multiple concurrent transactions.
- *
- * @author Dave Syer
- * @author Thomas Risberg
-=======
* The writer is thread safe once properties are set (normal singleton behavior)
* if a {@link CurrentSessionContext} that uses only one session per thread is
* used.
@@ -49,7 +42,6 @@
* @author Dave Syer
* @author Thomas Risberg
* @author Michael Minella
->>>>>>> BATCH-1904: Updated to support Hibernate 4
*
*/
public class HibernateItemWriter<T> implements ItemWriter<T>, InitializingBean {
@@ -159,13 +151,8 @@ protected void doWrite(SessionFactory sessionFactory, List<? extends T> items) {
}
/**
-<<<<<<< HEAD
- * Do perform the actual write operation. This can be overridden in a
- * subclass if necessary.
-=======
* Do perform the actual write operation using {@link HibernateOperations}.
* This can be overridden in a subclass if necessary.
->>>>>>> BATCH-1904: Updated to support Hibernate 4
*
* @param hibernateTemplate
* the HibernateTemplate to use for the operation
Please sign in to comment.
Something went wrong with that request. Please try again.