Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D2711200B45 for ; Fri, 15 Jul 2016 15:18:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D10AE160A79; Fri, 15 Jul 2016 13:18:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 269BB160A61 for ; Fri, 15 Jul 2016 15:18:36 +0200 (CEST) Received: (qmail 32588 invoked by uid 500); 15 Jul 2016 13:18:29 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 31946 invoked by uid 99); 15 Jul 2016 13:18:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2016 13:18:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2A2E9EE68A; Fri, 15 Jul 2016 13:18:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Fri, 15 Jul 2016 13:18:39 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/50] [abbrv] struts git commit: fix conflict archived-at: Fri, 15 Jul 2016 13:18:37 -0000 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 Authored: Mon Jan 4 15:31:54 2016 -0400 Committer: Lukasz Lenart 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());