[commons-dbcp] branch master updated: Use try-with-resources.

[ggregory]

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 607deae  Use try-with-resources.
607deae is described below

commit 607deaeb1148bc1df12b4405eecad578a495ca44
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Thu Aug 19 08:38:28 2021 -0400

    Use try-with-resources.
---
 .../commons/dbcp2/TestBasicDataSourceFactory.java  | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git 
a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java 
b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
index 2ef99db..742e420 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
@@ -156,18 +156,18 @@ public class TestBasicDataSourceFactory {
         try {
             StackMessageLog.lock();
             StackMessageLog.clear();
-            final Reference ref = new Reference("javax.sql.DataSource",
-                                          
BasicDataSourceFactory.class.getName(), null);
+            final Reference ref = new Reference("javax.sql.DataSource", 
BasicDataSourceFactory.class.getName(), null);
             final Properties properties = getTestProperties();
             for (final Entry<Object, Object> entry : properties.entrySet()) {
                 ref.add(new StringRefAddr((String) entry.getKey(), (String) 
entry.getValue()));
             }
             final BasicDataSourceFactory basicDataSourceFactory = new 
BasicDataSourceFactory();
-            final BasicDataSource ds = (BasicDataSource) 
basicDataSourceFactory.getObjectInstance(ref, null, null, null);
-            checkDataSourceProperties(ds);
-            checkConnectionPoolProperties(ds.getConnectionPool());
-            final List<String> messages = StackMessageLog.getAll();
-            assertEquals(0,messages.size());
+            try (final BasicDataSource ds = (BasicDataSource) 
basicDataSourceFactory.getObjectInstance(ref, null, null, null)) {
+                checkDataSourceProperties(ds);
+                checkConnectionPoolProperties(ds.getConnectionPool());
+                final List<String> messages = StackMessageLog.getAll();
+                assertEquals(0, messages.size());
+            }
         } finally {
             StackMessageLog.clear();
             StackMessageLog.unLock();
@@ -177,15 +177,16 @@ public class TestBasicDataSourceFactory {
     @Test
     public void testNoProperties() throws Exception {
         final Properties properties = new Properties();
-        final BasicDataSource ds = 
BasicDataSourceFactory.createDataSource(properties);
-
-        assertNotNull(ds);
+        try (final BasicDataSource ds = 
BasicDataSourceFactory.createDataSource(properties)) {
+            assertNotNull(ds);
+        }
     }
 
     @Test
     public void testProperties() throws Exception {
-        final BasicDataSource ds = 
BasicDataSourceFactory.createDataSource(getTestProperties());
-        checkDataSourceProperties(ds);
+        try (final BasicDataSource ds = 
BasicDataSourceFactory.createDataSource(getTestProperties())) {
+            checkDataSourceProperties(ds);
+        }
     }
 
     @Test