Skip to content

Fix incorrect resource closing order in AbstractCursorItemReader#doClose #5110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix incorrect resource closing order in AbstractCursorItemReader#doClose #5110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...ain/java/org/springframework/batch/infrastructure/item/database/JdbcCursorItemReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,15 @@ protected void openCursor(Connection con) {
}

/**
* Close the cursor and database connection.
* @param connection to the database
* Releases JDBC resources associated with this reader.
* Closes the PreparedStatement used for the cursor.
* The Connection is not closed here; it is managed by the parent class.
*
* @param connection the active database connection used for the cursor
*/
@Override
protected void cleanupOnClose(Connection connection) {
JdbcUtils.closeStatement(this.preparedStatement);
JdbcUtils.closeConnection(connection);
}

@Override
Expand Down
8 changes: 5 additions & 3 deletions ...ava/org/springframework/batch/infrastructure/item/database/StoredProcedureItemReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,13 +234,15 @@ protected void openCursor(Connection con) {
}

/**
* Close the cursor and database connection.
* @param connection to the database
* Releases JDBC resources associated with this reader.
* Closes the PreparedStatement used for the cursor.
* The Connection is not closed here; it is managed by the parent class.
*
* @param connection the active database connection used for the cursor
*/
@Override
protected void cleanupOnClose(Connection connection) {
JdbcUtils.closeStatement(this.callableStatement);
JdbcUtils.closeConnection(connection);
}

@Override
Expand Down