You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/04/01 15:48:00 UTC

[commons-dbcp] branch master updated: [DBCP-542] Fix tests on Java 11.

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git


The following commit(s) were added to refs/heads/master by this push:
     new 1959a36  [DBCP-542] Fix tests on Java 11.
1959a36 is described below

commit 1959a363cc8950ceb1959bf78d47f8d11e383243
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Apr 1 11:47:53 2019 -0400

    [DBCP-542] Fix tests on Java 11.
---
 .travis.yml                                        |  1 +
 src/changes/changes.xml                            |  3 ++
 .../dbcp2/managed/TestSynchronizationOrder.java    | 38 +++++++++++-----------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 83f01b3..1cf4ffb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ jdk:
   - oraclejdk11
   - openjdk8
   - openjdk11
+  - openjdk12
   - openjdk-ea
 
   
\ No newline at end of file
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9ff7a4c..5962f07 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -76,6 +76,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="update" issue="DBCP-541" due-to="Allon Murienik">
         Upgrade to JUnit Jupiter #19.
       </action>
+      <action dev="ggregory" type="update" issue="DBCP-542" due-to="Zheng Feng, Gary Gregory">
+        Fix tests on Java 11.
+      </action>
     </release>
     <release version="2.6.0" date="2019-02-14" description="This is a minor release, including bug fixes and enhancements.">
       <action dev="chtompki" type="add" issue="DBCP-534" due-to="Peter Wicks">
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java b/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
index 6233343..6f610f8 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
@@ -63,31 +63,31 @@ public class TestSynchronizationOrder {
 
     @Test
     public void testSessionSynchronization() throws Exception {
-        final DataSourceXAConnectionFactory xaConnectionFactory = new DataSourceXAConnectionFactory(transactionManager, xads);
+        final DataSourceXAConnectionFactory xaConnectionFactory = new DataSourceXAConnectionFactory(transactionManager,
+                xads);
 
-        final PoolableConnectionFactory factory =
-                new PoolableConnectionFactory(xaConnectionFactory, null);
+        final PoolableConnectionFactory factory = new PoolableConnectionFactory(xaConnectionFactory, null);
         factory.setValidationQuery("SELECT DUMMY FROM DUAL");
         factory.setDefaultReadOnly(Boolean.TRUE);
         factory.setDefaultAutoCommit(Boolean.TRUE);
 
         // create the pool
-        final GenericObjectPool pool = new GenericObjectPool<>(factory);
-        factory.setPool(pool);
-        pool.setMaxTotal(10);
-        pool.setMaxWaitMillis(1000);
-
-        // finally create the datasource
-        final ManagedDataSource ds = new ManagedDataSource<>(pool, xaConnectionFactory.getTransactionRegistry());
-        ds.setAccessToUnderlyingConnectionAllowed(true);
-
-
-        transactionManager.begin();
-        final DelegatingConnection<?> connectionA = (DelegatingConnection<?>) ds.getConnection();
-        connectionA.close();
-        transactionManager.commit();
-        assertTrue(transactionManagerRegistered);
-        assertFalse(transactionSynchronizationRegistryRegistered);
+        try (final GenericObjectPool pool = new GenericObjectPool<>(factory)) {
+            factory.setPool(pool);
+            pool.setMaxTotal(10);
+            pool.setMaxWaitMillis(1000);
+
+            // finally create the datasource
+            final ManagedDataSource ds = new ManagedDataSource<>(pool, xaConnectionFactory.getTransactionRegistry());
+            ds.setAccessToUnderlyingConnectionAllowed(true);
+
+            transactionManager.begin();
+            final DelegatingConnection<?> connectionA = (DelegatingConnection<?>) ds.getConnection();
+            connectionA.close();
+            transactionManager.commit();
+            assertTrue(transactionManagerRegistered);
+            assertFalse(transactionSynchronizationRegistryRegistered);
+        }
     }
 
     @Test