fix conflict Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0af9d3b6 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0af9d3b6 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0af9d3b6
Branch: refs/heads/master Commit: 0af9d3b60dd3bfd6ff76f337ad72ab5547499e73 Parents: a401f3a Author: Victor Sosa <victorns...@gmail.com> Authored: Mon Jan 4 15:31:54 2016 -0400 Committer: Victor Sosa <victorns...@gmail.com> Committed: Mon Jan 4 15:31:54 2016 -0400 ---------------------------------------------------------------------- .../struts2/views/jasperreports/JasperReportsResult.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/0af9d3b6/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 e356506..e0ea121 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 @@ -385,6 +385,12 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe } catch (JRException e) { LOG.error("Error producing {} report for uri {}", format, systemId, 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.size());
