fix conflict
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e9bd9453 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e9bd9453 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e9bd9453 Branch: refs/heads/master Commit: e9bd9453d592d50f5cde5d76f5e0544fa708e147 Parents: a446cda Author: Victor Sosa <victorns...@gmail.com> Authored: Mon Jan 4 15:31:54 2016 -0400 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Tue Jan 19 16:18:00 2016 +0100 ---------------------------------------------------------------------- .../struts2/views/jasperreports/JasperReportsResult.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/e9bd9453/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 bee69d6..312604d 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());
