You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/01/04 20:25:19 UTC
struts git commit: A proper way to close the db connection Conflicts:
plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
Repository: struts
Updated Branches:
refs/heads/support-2-3 1158b0add -> bf46145ba
A proper way to close the db connection
Conflicts:
plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bf46145b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bf46145b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bf46145b
Branch: refs/heads/support-2-3
Commit: bf46145bafb550fe4001f3ffbee0aec9752030e0
Parents: 1158b0a
Author: Victor Sosa <vi...@gmail.com>
Authored: Sun Jan 3 08:05:03 2016 -0400
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Jan 4 20:21:15 2016 +0100
----------------------------------------------------------------------
.../struts2/views/jasperreports/JasperReportsResult.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/bf46145b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
index 8c0c901..8c6806c 100644
--- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
+++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
@@ -65,7 +65,7 @@ import java.util.TimeZone;
* format is specified.
* <p/>
* <!-- END SNIPPET: description -->
- * <p />
+ * <p>
* <b>This result type takes the following parameters:</b>
* <p/>
* <!-- START SNIPPET: params -->
@@ -397,6 +397,12 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe
String message = "Error producing " + format + " report for uri " + systemId;
LOG.error(message, e);
throw new ServletException(e.getMessage(), e);
+ } finally {
+ try {
+ conn.close();
+ } catch (Exception e) {
+ LOG.warn("Could not close db connection properly", e);
+ }
}
response.setContentLength(output.length);