Skip to content

[DBCP-522] Invalidate auto-commit cache before driver calls #549

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
hutiefang76 wants to merge 2 commits into
base: master
Choose a base branch
from
+108 −0
Open

[DBCP-522] Invalidate auto-commit cache before driver calls #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6546d03
[DBCP-522] Invalidate auto-commit cache before driver calls
hutiefang76 Oct 23, 2026
0fb5efe
Remove DBCP-522 changelog entry per review
hutiefang76 Oct 23, 2026
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
1 change: 1 addition & 0 deletions src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,7 @@ public void rollback(final Savepoint savepoint) throws SQLException {
@Override
public void setAutoCommit(final boolean autoCommit) throws SQLException {
checkOpen();
cachedAutoCommit = null;
try {
connection.setAutoCommit(autoCommit);
if (cacheState) {
Expand Down
107 changes: 107 additions & 0 deletions src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

Expand Down Expand Up @@ -343,6 +344,112 @@ void testRollbackSavepoint() throws Exception {
}
}

@Test
void testSetAutoCommitErrorAfterPhysicalChange() throws SQLException {
try (Connection physical = DriverManager.getConnection("jdbc:h2:mem:dcp522_autocommit_error")) {
physical.setAutoCommit(true);
final AssertionError failure = new AssertionError("setAutoCommit failed");
final Connection faulty = new DelegatingConnection<Connection>(physical) {
@Override
public void setAutoCommit(final boolean autoCommit) throws SQLException {
super.setAutoCommit(autoCommit);
throw failure;
}
};
try (DelegatingConnection<Connection> outer = new DelegatingConnection<>(faulty)) {
assertTrue(outer.getAutoCommit());
final AssertionError thrown = assertThrows(AssertionError.class, () -> outer.setAutoCommit(false));
assertSame(failure, thrown);
assertFalse(physical.getAutoCommit());
assertFalse(outer.getAutoCommit());
}
}
}

@Test
void testSetAutoCommitErrorFromDelegateGetter() throws SQLException {
try (Connection physical = DriverManager.getConnection("jdbc:h2:mem:dcp522_autocommit_getter_error")) {
physical.setAutoCommit(true);
final AssertionError failure = new AssertionError("getAutoCommit failed");
final Connection faulty = new DelegatingConnection<Connection>(physical) {
private boolean failedOnce;

@Override
public boolean getAutoCommit() throws SQLException {
if (!failedOnce && !physical.getAutoCommit()) {
failedOnce = true;
throw failure;
}
return physical.getAutoCommit();
}
};
try (DelegatingConnection<Connection> outer = new DelegatingConnection<>(faulty)) {
assertTrue(outer.getAutoCommit());
final AssertionError thrown = assertThrows(AssertionError.class, () -> outer.setAutoCommit(false));
assertSame(failure, thrown);
assertFalse(physical.getAutoCommit());
assertFalse(outer.getAutoCommit());
}
}
}

@Test
void testSetAutoCommitErrorWithCacheStateDisabled() throws SQLException {
try (Connection physical = DriverManager.getConnection("jdbc:h2:mem:dcp522_autocommit_no_cache")) {
physical.setAutoCommit(true);
final AssertionError failure = new AssertionError("setAutoCommit failed");
final DelegatingConnection<Connection> faulty = new DelegatingConnection<Connection>(physical) {
@Override
public void setAutoCommit(final boolean autoCommit) throws SQLException {
super.setAutoCommit(autoCommit);
throw failure;
}
};
faulty.setCacheState(false);
try (DelegatingConnection<DelegatingConnection<Connection>> outer = new DelegatingConnection<>(faulty)) {
outer.setCacheState(false);
assertTrue(outer.getAutoCommit());
final AssertionError thrown = assertThrows(AssertionError.class, () -> outer.setAutoCommit(false));
assertSame(failure, thrown);
assertFalse(physical.getAutoCommit());
assertFalse(outer.getAutoCommit());
}
}
}

@Test
void testSetAutoCommitSqlExceptionAfterPhysicalChange() throws SQLException {
try (Connection physical = DriverManager.getConnection("jdbc:h2:mem:dcp522_autocommit_sql_exception")) {
physical.setAutoCommit(true);
final SQLException failure = new SQLException("setAutoCommit failed");
final Connection faulty = new DelegatingConnection<Connection>(physical) {
@Override
public void setAutoCommit(final boolean autoCommit) throws SQLException {
super.setAutoCommit(autoCommit);
throw failure;
}
};
try (DelegatingConnection<Connection> outer = new DelegatingConnection<>(faulty)) {
assertTrue(outer.getAutoCommit());
final SQLException thrown = assertThrows(SQLException.class, () -> outer.setAutoCommit(false));
assertSame(failure, thrown);
assertFalse(physical.getAutoCommit());
assertFalse(outer.getAutoCommit());
}
}
}

@Test
void testSetAutoCommitSuccessUpdatesCache() throws SQLException {
try (Connection physical = DriverManager.getConnection("jdbc:h2:mem:dcp522_autocommit_success");
DelegatingConnection<Connection> outer = new DelegatingConnection<>(physical)) {
assertTrue(outer.getAutoCommit());
outer.setAutoCommit(false);
assertFalse(physical.getAutoCommit());
assertFalse(outer.getAutoCommit());
}
}

@Test
void testSetClientInfo() throws Exception {
// TODO
Expand Down