Merge pull request #3079 from mapfish/backport/3072-to-3.27

[Backport 3.27] Close the database connection
mapfish · Oct 20, 2023 · f050bc3 · f050bc3
2 parents 0385679 + 2c3ab5a
commit f050bc3
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java b/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java
@@ -181,19 +181,21 @@ public final Print getJasperPrint(
 
         }
         if (template.getJdbcUrl() != null) {
-            Connection connection;
-            if (template.getJdbcUser() != null) {
-                connection = DriverManager.getConnection(
+            Connection connection = null;
+            try {
+                if (template.getJdbcUser() != null) {
+                    connection = DriverManager.getConnection(
                         template.getJdbcUrl(), template.getJdbcUser(), template.getJdbcPassword());
-            } else {
-                connection = DriverManager.getConnection(template.getJdbcUrl());
-            }
-
-            print = fillManager.fill(
-                    jasperTemplateBuild.getAbsolutePath(),
-                    values.asMap(),
-                    connection);
+                } else {
+                    connection = DriverManager.getConnection(template.getJdbcUrl());
+                }
 
+                print = fillManager.fill(jasperTemplateBuild.getAbsolutePath(), values.asMap(), connection);
+            } finally {
+                if (connection != null && !connection.isClosed()) {
+                    connection.close();
+                }
+            }
         } else {
             JRDataSource dataSource;
             if (template.getTableDataKey() != null) {