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);
     }
   }