glenn 2002/09/20 07:05:15
Modified: catalina/src/share/org/apache/catalina/session
JDBCStore.java
Log:
Fix bug 12286, thanks to [EMAIL PROTECTED] (Ronald Klop)
Revision Changes Path
1.6 +40 -28
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/JDBCStore.java
Index: JDBCStore.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/JDBCStore.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JDBCStore.java 17 Apr 2002 17:07:53 -0000 1.5
+++ JDBCStore.java 20 Sep 2002 14:05:14 -0000 1.6
@@ -758,40 +758,52 @@
;
}
- try {
- preparedSizeSql.close();
- } catch (SQLException e) {
- ;
+ if( preparedSizeSql != null ) {
+ try {
+ preparedSizeSql.close();
+ } catch (SQLException e) {
+ ;
+ }
}
- try {
- preparedKeysSql.close();
- } catch (SQLException e) {
- ;
+ if( preparedKeysSql != null ) {
+ try {
+ preparedKeysSql.close();
+ } catch (SQLException e) {
+ ;
+ }
}
- try {
- preparedSaveSql.close();
- } catch (SQLException e) {
- ;
+ if( preparedSaveSql != null ) {
+ try {
+ preparedSaveSql.close();
+ } catch (SQLException e) {
+ ;
+ }
}
- try {
- preparedClearSql.close();
- } catch (SQLException e) {
- ;
+ if( preparedClearSql != null ) {
+ try {
+ preparedClearSql.close();
+ } catch (SQLException e) {
+ ;
+ }
}
- try {
- preparedRemoveSql.close();
- } catch (SQLException e) {
- ;
+ if( preparedRemoveSql != null ) {
+ try {
+ preparedRemoveSql.close();
+ } catch (SQLException e) {
+ ;
+ }
}
- try {
- preparedLoadSql.close();
- } catch (SQLException e) {
- ;
+ if( preparedLoadSql != null ) {
+ try {
+ preparedLoadSql.close();
+ } catch (SQLException e) {
+ ;
+ }
}
try {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
