markt 2004/03/20 02:57:18
Modified: catalina/src/share/org/apache/catalina/session
JDBCStore.java
Log:
- Fix bug 18369. Prevent npe in StoreBase if a sql exception occurs.
- Remove unused imports identified by Eclipse.
Revision Changes Path
1.12 +6 -8
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JDBCStore.java 12 Mar 2003 01:19:03 -0000 1.11
+++ JDBCStore.java 20 Mar 2004 10:57:18 -0000 1.12
@@ -65,16 +65,13 @@
package org.apache.catalina.session;
import java.io.InputStream;
-import java.io.OutputStream;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.ObjectStreamClass;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
@@ -470,6 +467,7 @@
keys = (String[]) tmpkeys.toArray(new String[tmpkeys.size()]);
} catch(SQLException e) {
log(sm.getString(getStoreName()+".SQLException", e));
+ keys = new String[0];
} finally {
try {
if(rst != null) {
@@ -482,7 +480,7 @@
release(_conn);
}
}
-
+
return(keys);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
