[0.10.0-SNAPSHOT]

Potential connection double close for LiquibaseJdbcMigrationEngine fixed
GoodforGod · Apr 14, 2024 · 547d61f · 547d61f
1 parent 4a90864
commit 547d61f
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/.../main/java/io/goodforgod/testcontainers/extensions/jdbc/LiquibaseJdbcMigrationEngine.java b/.../main/java/io/goodforgod/testcontainers/extensions/jdbc/LiquibaseJdbcMigrationEngine.java
@@ -94,18 +94,16 @@ public void apply(@NotNull List<String> locations) {
                 getClass().getSimpleName(), jdbcConnection);
 
         try {
-            try (Connection connection = jdbcConnection.openConnection()) {
-                try (var database = getLiquiDatabase(connection)) {
-                    migrateLiquibase(database, locations);
-                }
+            Connection connection = jdbcConnection.openConnection();
+            try (var database = getLiquiDatabase(connection)) {
+                migrateLiquibase(database, locations);
             }
         } catch (Exception e) {
             try {
                 Thread.sleep(250);
-                try (Connection connection = jdbcConnection.openConnection()) {
-                    try (var database = getLiquiDatabase(connection)) {
-                        migrateLiquibase(database, locations);
-                    }
+                Connection connection = jdbcConnection.openConnection();
+                try (var database = getLiquiDatabase(connection)) {
+                    migrateLiquibase(database, locations);
                 }
             } catch (Exception ex) {
                 logger.error("Failed migration apply for engine '{}' for connection: {}",
@@ -125,18 +123,16 @@ public void drop(@NotNull List<String> locations) {
                 getClass().getSimpleName(), jdbcConnection);
 
         try {
-            try (Connection connection = jdbcConnection.openConnection()) {
-                try (var database = getLiquiDatabase(connection)) {
-                    dropLiquibase(database, locations);
-                }
+            Connection connection = jdbcConnection.openConnection();
+            try (var database = getLiquiDatabase(connection)) {
+                dropLiquibase(database, locations);
             }
         } catch (Exception e) {
             try {
                 Thread.sleep(250);
-                try (Connection connection = jdbcConnection.openConnection()) {
-                    try (var database = getLiquiDatabase(connection)) {
-                        dropLiquibase(database, locations);
-                    }
+                Connection connection = jdbcConnection.openConnection();
+                try (var database = getLiquiDatabase(connection)) {
+                    dropLiquibase(database, locations);
                 }
             } catch (Exception ex) {
                 logger.error("Failed migration drop for engine '{}' for connection: {}",