Repository: commons-dbcp Updated Branches: refs/heads/master bc7a3969c -> c2efa4a80
Use final. Change test ivar from private to protected. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/c2efa4a8 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/c2efa4a8 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/c2efa4a8 Branch: refs/heads/master Commit: c2efa4a80ff5bdc422999e3cba6843935aded1a0 Parents: bc7a396 Author: Gary Gregory <ggreg...@apache.org> Authored: Wed Jul 25 17:19:49 2018 -0600 Committer: Gary Gregory <ggreg...@apache.org> Committed: Wed Jul 25 17:19:49 2018 -0600 ---------------------------------------------------------------------- .../apache/commons/dbcp2/managed/TestManagedDataSource.java | 2 +- .../commons/dbcp2/managed/TestManagedDataSourceInTx.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/c2efa4a8/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java index 7697345..d3d56f4 100644 --- a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java +++ b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java @@ -54,7 +54,7 @@ public class TestManagedDataSource extends TestConnectionPool { } protected PoolingDataSource<PoolableConnection> ds = null; - private GenericObjectPool<PoolableConnection> pool = null; + protected GenericObjectPool<PoolableConnection> pool = null; protected TransactionManager transactionManager; @Before http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/c2efa4a8/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java index c3283ae..0dbfe76 100644 --- a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java +++ b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java @@ -111,16 +111,16 @@ public class TestManagedDataSourceInTx extends TestManagedDataSource { } @Override - public void afterCompletion(int i) { + public void afterCompletion(final int i) { try { - Connection connection1 = ds.getConnection(); + final Connection connection1 = ds.getConnection(); try { connection1.getWarnings(); fail("Could operate on closed connection"); - } catch (SQLException e) { + } catch (final SQLException e) { // This is expected } - } catch (SQLException e) { + } catch (final SQLException e) { fail("Should have been able to get connection"); } }
