bip 01/04/26 13:17:21
Modified: catalina/src/share/org/apache/catalina/session
JDBCStore.java
Log:
Changed the SQL Statement for keys(), threw an error under MySQL.
Revision Changes Path
1.3 +26 -23
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JDBCStore.java 2001/04/26 03:14:59 1.2
+++ JDBCStore.java 2001/04/26 20:17:15 1.3
@@ -1,8 +1,8 @@
/*
* JDBCStore.java
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/JDBCStore.java,v
1.2 2001/04/26 03:14:59 bip Exp $
- * $Revision: 1.2 $
- * $Date: 2001/04/26 03:14:59 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/JDBCStore.java,v
1.3 2001/04/26 20:17:15 bip Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/04/26 20:17:15 $
*
* ====================================================================
*
@@ -93,7 +93,7 @@
* saved are still subject to being expired based on inactivity.
*
* @author Bip Thelin
- * @version $Revision: 1.2 $, $Date: 2001/04/26 03:14:59 $
+ * @version $Revision: 1.3 $, $Date: 2001/04/26 20:17:15 $
*/
public class JDBCStore
@@ -388,10 +388,10 @@
*/
public String[] keys() throws IOException {
String keysSql =
- "SELECT c.size, s."+sessionIdCol+
- " FROM "+sessionTable+" s, "+
- "(SELECT COUNT("+sessionIdCol+
- ") AS size FROM "+sessionTable+") c";
+ "SELECT COUNT(s."+sessionIdCol+"), s."+sessionIdCol+
+ " FROM "+sessionTable+" s, "+sessionTable+" c"+
+ " GROUP BY c."+sessionIdCol;
+
Connection _conn = getConnection();
ResultSet rst = null;
String keys[] = null;
@@ -535,25 +535,28 @@
release(_conn);
_conn = null;
}
-
- try {
- _session = (StandardSession) manager.createSession();
- _session.readObjectData(ois);
- _session.setManager(manager);
- } finally {
- if (ois != null) {
- try {
- ois.close();
- bis = null;
- } catch (IOException e) {
- ;
+
+ if(ois != null) {
+ try {
+ _session = (StandardSession) manager.createSession();
+ _session.readObjectData(ois);
+ _session.setManager(manager);
+ } finally {
+ if (ois != null) {
+ try {
+ ois.close();
+ bis = null;
+ } catch (IOException e) {
+ ;
+ }
}
}
+
+ if (debug > 0)
+ log(sm.getString(getStoreName()+".loading",
+ id, sessionTable));
}
- if (debug > 0)
- log(sm.getString(getStoreName()+".loading",
- id, sessionTable));
return(_session);
}
