bloritsch 02/02/19 12:27:36
Modified: . build.xml
src/java/org/apache/avalon/excalibur/datasource
AbstractJdbcConnection.java
src/scratchpad/org/apache/avalon/excalibur/system
ConfigurableRoleManager.java
ExcaliburRoleManager.java
Log:
Fix unclosed resultset problems
Revision Changes Path
1.103 +1 -1 jakarta-avalon-excalibur/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/build.xml,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- build.xml 9 Feb 2002 00:18:19 -0000 1.102
+++ build.xml 19 Feb 2002 20:27:36 -0000 1.103
@@ -25,7 +25,7 @@
Give user a chance to override without editing this file
(and without typing -D each time he compiles it)
-->
- <property file=".ant.properties"/>
+ <property file="build.properties"/>
<property file="${user.home}/.ant.properties"/>
<property name="name" value="excalibur"/>
1.12 +3 -2
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java
Index: AbstractJdbcConnection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractJdbcConnection.java 26 Jan 2002 16:57:42 -0000 1.11
+++ AbstractJdbcConnection.java 19 Feb 2002 20:27:36 -0000 1.12
@@ -29,7 +29,7 @@
* total number of Connection objects that are created.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.11 $ $Date: 2002/01/26 16:57:42 $
+ * @version CVS $Revision: 1.12 $ $Date: 2002/02/19 20:27:36 $
* @since 4.1
*/
public abstract class AbstractJdbcConnection
@@ -146,7 +146,8 @@
try
{
- m_testStatement.executeQuery();
+ ResultSet rs = m_testStatement.executeQuery();
+ rs.close();
}
catch (final SQLException se)
{
1.4 +2 -2
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/ConfigurableRoleManager.java
Index: ConfigurableRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/ConfigurableRoleManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConfigurableRoleManager.java 30 Jan 2002 15:44:06 -0000 1.3
+++ ConfigurableRoleManager.java 19 Feb 2002 20:27:36 -0000 1.4
@@ -21,7 +21,7 @@
* in the org.apache.avalon.component package.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.3 $ $Date: 2002/01/30 15:44:06 $
+ * @version CVS $Revision: 1.4 $ $Date: 2002/02/19 20:27:36 $
* @since 4.1
*/
public class ConfigurableRoleManager
@@ -82,7 +82,7 @@
final String role = roles[ i ].getAttribute( "name" );
Configuration[] components = roles[i].getChildren( "component" );
- for ( int j = 0; i < components.length; j++)
+ for ( int j = 0; j < components.length; j++)
{
final String shorthand = components[ j ].getAttribute(
"shorthand" );
final String className =
1.5 +2 -2
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/ExcaliburRoleManager.java
Index: ExcaliburRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/ExcaliburRoleManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExcaliburRoleManager.java 19 Feb 2002 13:47:29 -0000 1.4
+++ ExcaliburRoleManager.java 19 Feb 2002 20:27:36 -0000 1.5
@@ -20,7 +20,7 @@
* information is hard-coded.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.4 $ $Date: 2002/02/19 13:47:29 $
+ * @version CVS $Revision: 1.5 $ $Date: 2002/02/19 20:27:36 $
* @since 4.1
*/
public class ExcaliburRoleManager
@@ -119,7 +119,7 @@
setup( shorts, classes, handlers, "parser",
"org.apache.avalon.excalibur.xml.Parser",
"org.apache.avalon.excalibur.xml.JaxpParser",
-
"org.apache.avalon.excalibur.system.handler.PoolableComponentHandler" );
+
"org.apache.avalon.excalibur.system.handler.PerThreadComponentHandler" );
setup( shorts, classes, handlers, "xerces-parser",
"org.apache.avalon.excalibur.xml.Parser",
"org.apache.avalon.excalibur.xml.XercesParser",
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
