Return-Path: Delivered-To: apmail-labs-commits-archive@minotaur.apache.org Received: (qmail 64102 invoked from network); 10 Nov 2009 12:19:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Nov 2009 12:19:38 -0000 Received: (qmail 67755 invoked by uid 500); 10 Nov 2009 12:19:37 -0000 Delivered-To: apmail-labs-commits-archive@labs.apache.org Received: (qmail 67637 invoked by uid 500); 10 Nov 2009 12:19:37 -0000 Mailing-List: contact commits-help@labs.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: labs@labs.apache.org Delivered-To: mailing list commits@labs.apache.org Received: (qmail 67625 invoked by uid 99); 10 Nov 2009 12:19:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Nov 2009 12:19:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Nov 2009 12:19:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CD06E238888E; Tue, 10 Nov 2009 12:19:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r834448 - /labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/templating/Template.java Date: Tue, 10 Nov 2009 12:19:13 -0000 To: commits@labs.apache.org From: simoneg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091110121913.CD06E238888E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: simoneg Date: Tue Nov 10 12:19:13 2009 New Revision: 834448 URL: http://svn.apache.org/viewvc?rev=834448&view=rev Log: Force closing the template input stream Modified: labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/templating/Template.java Modified: labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/templating/Template.java URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/templating/Template.java?rev=834448&r1=834447&r2=834448&view=diff ============================================================================== --- labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/templating/Template.java (original) +++ labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/templating/Template.java Tue Nov 10 12:19:13 2009 @@ -216,9 +216,21 @@ // We can ignore the FindBugs error here, it refers to the opposite situation, where // a resource is relative to this class. In our case, the behavior is the correct one, // because the resource is relative to the subclass. - InputStream inputStream = getClass().getResourceAsStream(fileName); - InputStreamReader reader = new InputStreamReader(inputStream, Charset.forName("UTF-8")); - return new TemplateData(reader); + try { + InputStream inputStream = getClass().getResourceAsStream(fileName); + try { + InputStreamReader reader = new InputStreamReader(inputStream, Charset.forName("UTF-8")); + return new TemplateData(reader); + } finally { + try { + inputStream.close(); + } catch (Exception e) { + // Ignore the close exception + } + } + } catch (Exception e) { + throw new MagmaException(e, "Error reading template"); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org For additional commands, e-mail: commits-help@labs.apache.org