Skip to content

Don't get Statement from closed ResultSet #1130

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

Merged
sergiyvamz merged 1 commit into from
Oct 4, 2024
Merged

Don't get Statement from closed ResultSet #1130

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
2 changes: 1 addition & 1 deletion wrapper/src/main/java/software/amazon/jdbc/util/WrapperUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ public static Connection getConnectionFromSqlObject(final Object obj) {
return !stmt.isClosed() ? stmt.getConnection() : null;
} else if (obj instanceof ResultSet) {
final ResultSet rs = (ResultSet) obj;
final Statement stmt = rs.getStatement();
final Statement stmt = !rs.isClosed() ? rs.getStatement() : null;
return stmt != null && !stmt.isClosed() ? stmt.getConnection() : null;
}
} catch (final SQLException | UnsupportedOperationException e) {
Expand Down
10 changes: 10 additions & 0 deletions wrapper/src/test/java/software/amazon/jdbc/util/WrapperUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,16 @@ void getConnectionFromSqlObjectChecksStatementNotClosed() throws Exception {
assertNull(rsConn);
}

@Test
void getConnectionFromSqlObjectChecksResultSetNotClosed() throws Exception {
final ResultSet mockResultSet = mock(ResultSet.class);
when(mockResultSet.isClosed()).thenReturn(true);
when(mockResultSet.getStatement()).thenThrow(IllegalStateException.class);

final Connection rsConn = WrapperUtils.getConnectionFromSqlObject(mockResultSet);
assertNull(rsConn);
}

@Test
void testStatementWrapper() throws InstantiationException {
ConnectionPluginManager mockPluginManager = mock(ConnectionPluginManager.class);
Expand Down