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 [EMAIL PROTECTED] (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:[EMAIL PROTECTED]">Carsten Ziegeler</a> * @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a> * @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a> - * (PWR Organisation & Entwicklung) * @author <a href="mailto:[EMAIL PROTECTED]">Sven Beauprez</a> * @author <a href="mailto:[EMAIL PROTECTED]">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
