You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ki...@apache.org on 2001/04/15 12:48:55 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session StandardManager.java
kief 01/04/15 03:48:55
Modified: catalina/src/share/org/apache/catalina/session
StandardManager.java
Log:
Moved session loading/unloading to the start/stop methods from
StandardContext. Also commented out the requirement that the
session serialization file path be absolute.
Revision Changes Path
1.8 +20 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java
Index: StandardManager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StandardManager.java 2001/04/12 18:18:57 1.7
+++ StandardManager.java 2001/04/15 10:48:55 1.8
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java,v 1.7 2001/04/12 18:18:57 kief Exp $
- * $Revision: 1.7 $
- * $Date: 2001/04/12 18:18:57 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java,v 1.8 2001/04/15 10:48:55 kief Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/04/15 10:48:55 $
*
* ====================================================================
*
@@ -105,7 +105,7 @@
* <code>stop()</code> methods of this class at the correct times.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.7 $ $Date: 2001/04/12 18:18:57 $
+ * @version $Revision: 1.8 $ $Date: 2001/04/15 10:48:55 $
*/
public class StandardManager
@@ -583,6 +583,13 @@
if (debug >= 1)
log("Force random number initialization completed");
+ // Load unloaded sessions, if any
+ try {
+ load();
+ } catch (Throwable t) {
+ log(sm.getString("standardManager.managerLoad"), t);
+ }
+
// Start the background reaper thread
threadStart();
@@ -613,6 +620,13 @@
// Stop the background reaper thread
threadStop();
+ // Write out sessions
+ try {
+ unload();
+ } catch (IOException e) {
+ log(sm.getString("standardManager.managerUnload"), e);
+ }
+
// Expire all active sessions
Session sessions[] = findSessions();
for (int i = 0; i < sessions.length; i++) {
@@ -679,8 +693,8 @@
file = new File(tempdir, pathname);
}
}
- if (!file.isAbsolute())
- return (null);
+// if (!file.isAbsolute())
+// return (null);
return (file);
}