From ac1dd4cbabc6db4d5cfa29a9e87842362fb72a86 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Thu, 11 Feb 2021 17:28:05 +1300 Subject: [PATCH] #2158 Refactor to use try with resources with Connection for platform selection via jdbc metaData --- .../server/core/DatabasePlatformFactory.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java index 55cf5b19a..a96907848 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java @@ -131,19 +131,10 @@ public class DatabasePlatformFactory { * Use JDBC DatabaseMetaData to determine the platform. */ private DatabasePlatform byDataSource(DataSource dataSource) { - - Connection connection = null; - try { - connection = dataSource.getConnection(); - DatabaseMetaData metaData = connection.getMetaData(); - - return byDatabaseMeta(metaData, connection); - + try (Connection connection = dataSource.getConnection()) { + return byDatabaseMeta(connection.getMetaData(), connection); } catch (SQLException ex) { throw new PersistenceException(ex); - - } finally { - JdbcClose.close(connection); } }