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

Added AbstractCursorItemReader.connectionAutoCommit to allow override of cursor connection autoCommit value

Browse Source 
autoCommit value is restored after connection use.
This commit is contained in:
Guillaume DARMONT
2017-01-06 11:04:18 +01:00
committed by Michael Minella
parent cae2cabdce
commit dca726af16
2 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractCursorItemReader.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2013 the original author or authors.
* Copyright 2006-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -134,6 +134,9 @@ implements InitializingBean {
private boolean useSharedExtendedConnection = false;
private Boolean connectionAutoCommit;
private Boolean initialConnectionAutoCommit;
public AbstractCursorItemReader() {
super();
@@ -356,6 +359,25 @@ implements InitializingBean {
return useSharedExtendedConnection;
}
/**
* Set whether "autoCommit" should be overridden for the connection used by the cursor. If not set, defaults to
* Connection / Datasource default configuration.
*
* @param autoCommit value used for {@link Connection#setAutoCommit(boolean)}.
*/
public void setConnectionAutoCommit(boolean autoCommit) {
this.connectionAutoCommit = autoCommit;
}
/**
* Return whether "autoCommit" should be overridden for the connection used by the cursor.
*
* @return the "autoCommit" value, or {@code null} if none to be applied.
*/
public Boolean getConnectionAutoCommit() {
return this.connectionAutoCommit;
}
public abstract String getSql();
/**
@@ -380,6 +402,9 @@ implements InitializingBean {
JdbcUtils.closeResultSet(this.rs);
rs = null;
cleanupOnClose();
if (this.initialConnectionAutoCommit != null) {
this.con.setAutoCommit(initialConnectionAutoCommit);
}
if (useSharedExtendedConnection && dataSource instanceof ExtendedConnectionDataSourceProxy) {
((ExtendedConnectionDataSourceProxy)dataSource).stopCloseSuppression(this.con);
if (!TransactionSynchronizationManager.isActualTransactionActive()) {
@@ -424,6 +449,10 @@ implements InitializingBean {
else {
this.con = dataSource.getConnection();
}
if (this.connectionAutoCommit != null && this.con.getAutoCommit() != this.connectionAutoCommit) {
this.initialConnectionAutoCommit = this.con.getAutoCommit();
this.con.setAutoCommit(this.connectionAutoCommit);
}
}
catch (SQLException se) {
close();