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

Polish

Browse Source
This commit is contained in:
Michael Minella
2017-11-30 15:01:02 -06:00
parent 1c9c30c10d
commit 40db8a770f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@ implements InitializingBean {
private boolean useSharedExtendedConnection = false;
private boolean connectionAutoCommit;
private Boolean connectionAutoCommit;
private boolean initialConnectionAutoCommit;
@@ -396,7 +396,9 @@ implements InitializingBean {
rs = null;
cleanupOnClose();
this.con.setAutoCommit(initialConnectionAutoCommit);
if(this.con != null) {
this.con.setAutoCommit(this.initialConnectionAutoCommit);
}
if (useSharedExtendedConnection && dataSource instanceof ExtendedConnectionDataSourceProxy) {
((ExtendedConnectionDataSourceProxy)dataSource).stopCloseSuppression(this.con);
@@ -445,7 +447,7 @@ implements InitializingBean {
this.initialConnectionAutoCommit = this.con.getAutoCommit();
if (this.con.getAutoCommit() != this.connectionAutoCommit) {
if (this.connectionAutoCommit != null && this.con.getAutoCommit() != this.connectionAutoCommit) {
this.con.setAutoCommit(this.connectionAutoCommit);
}
}

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderCommonTests.java
View File

@@ -29,7 +29,7 @@ public class JdbcCursorItemReaderCommonTests extends AbstractDatabaseItemStreamI
@Override
protected ItemReader<Foo> getItemReader() throws Exception {
JdbcCursorItemReader<Foo> result = new JdbcCursorItemReader<Foo>();
JdbcCursorItemReader<Foo> result = new JdbcCursorItemReader<>();
result.setDataSource(getDataSource());
result.setSql("select ID, NAME, VALUE from T_FOOS");
result.setIgnoreWarnings(true);