Return-Path: 
 <cvs-return-20396-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 34602 invoked from network); 11 Oct 2004 09:11:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 11 Oct 2004 09:11:34 -0000
Received: (qmail 16921 invoked by uid 500); 11 Oct 2004 09:11:30 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 16856 invoked by uid 500); 11 Oct 2004 09:11:28 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
list-post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 16836 invoked by uid 99); 11 Oct 2004 09:11:27 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Mon, 11 Oct 2004 02:11:23 -0700
Received: (qmail 34464 invoked by uid 65534); 11 Oct 2004 09:11:22 -0000
Date: 11 Oct 2004 09:11:22 -0000
Message-ID: <20041011091122.34462.qmail@minotaur.apache.org>
From: tcurdt@apache.org
To: cvs@cocoon.apache.org
Subject: svn commit: rev 54518 - in cocoon/trunk: .
 src/blocks/databases/java/org/apache/cocoon/transformation
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: tcurdt
Date: Mon Oct 11 02:11:21 2004
New Revision: 54518

Modified:
   cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java
   cocoon/trunk/status.xml
Log:
fixes bug 30874 reported by ats37@hotmail.com (Andrew Stevens)

do not close statement twice



Modified: cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java
==============================================================================
--- cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java	(original)
+++ cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java	Mon Oct 11 02:11:21 2004
@@ -66,7 +66,6 @@
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  * @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
  * @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
- *         (PWR Organisation & Entwicklung)
  * @author <a href="mailto:sven.beauprez@the-ecorp.com">Sven Beauprez</a>
  * @author <a href="mailto:a.saglimbeni@pro-netics.com">Alfio Saglimbeni</a>
  * @version CVS $Id$
@@ -1187,7 +1186,8 @@
                     } catch ( NullPointerException e ) {
                         getTheLogger().debug( "NullPointer while closing the resultset.", e );
                     }
-                if ( pst != null )
+                
+                if ( pst != null && pst != cst )
                     pst.close();
                 pst = null;        // Prevent using pst again.
                 if ( cst != null )

Modified: cocoon/trunk/status.xml
==============================================================================
--- cocoon/trunk/status.xml	(original)
+++ cocoon/trunk/status.xml	Mon Oct 11 02:11:21 2004
@@ -205,6 +205,9 @@
 
   <changes>
  <release version="@version@" date="@date@">
+   <action dev="TC" type="fix" fixes-bug="30874">
+    Fixes the SQLTransformer not to close the statement twice
+   </action>
    <action dev="CZ" type="add">
      New getSitemapPath() method on the Request object to get the path to the
      current sitemap even if you are in a sub sitemap. Added an abstract request