Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 18900 invoked from network); 2 Jan 2005 22:14:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 2 Jan 2005 22:14:44 -0000 Received: (qmail 39354 invoked by uid 500); 2 Jan 2005 22:14:43 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 39291 invoked by uid 500); 2 Jan 2005 22:14:43 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 39278 invoked by uid 99); 2 Jan 2005 22:14:43 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 02 Jan 2005 14:14:40 -0800 Received: (qmail 18840 invoked by uid 65534); 2 Jan 2005 22:14:39 -0000 Date: 2 Jan 2005 22:14:39 -0000 Message-ID: <20050102221439.18836.qmail@minotaur.apache.org> From: antonio@apache.org To: cvs@cocoon.apache.org Subject: svn commit: r123905 - /cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: antonio Date: Sun Jan 2 14:14:38 2005 New Revision: 123905 URL: http://svn.apache.org/viewcvs?view=rev&rev=123905 Log: One close should be enough. Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java?view=diff&rev=123905&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java&r1=123904&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java&r2=123905 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java Sun Jan 2 14:14:38 2005 @@ -33,7 +33,7 @@ * * based on the orginal esql.xsl * @author Torsten Curdt - * @version CVS $Id: EsqlHelper.java,v 1.4 2004/03/05 13:01:53 bdelacretaz Exp $ + * @version CVS $Id$ */ public class EsqlHelper { @@ -73,8 +73,6 @@ buffer = new byte[length]; reader.read(buffer); reader.close(); - if (reader != null) - reader.close(); if (buffer == null) return null; return buffer; @@ -115,8 +113,6 @@ buffer = new byte[length]; reader.read(buffer); reader.close(); - if (reader != null) - reader.close(); if (buffer != null) result = buffer; else if (defaultString != null && !defaultString.equals("_null_"))