kief 01/04/07 03:25:03
Modified: catalina/src/share/org/apache/catalina/session
PersistentManager.java
Log:
Applied Bip Thelin's <[EMAIL PROTECTED]> patch to allow Store
to be set from server.xml. Also added a check for the (default)
case where Store is not set.
Revision Changes Path
1.3 +8 -9
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManager.java
Index: PersistentManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PersistentManager.java 2001/03/14 02:17:22 1.2
+++ PersistentManager.java 2001/04/07 10:25:03 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManager.java,v
1.2 2001/03/14 02:17:22 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2001/03/14 02:17:22 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManager.java,v
1.3 2001/04/07 10:25:03 kief Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/04/07 10:25:03 $
*
* ====================================================================
*
@@ -106,7 +106,7 @@
* <li>Limit the number of active sessions kept in memory by
* swapping less active sessions out to disk.</li>
*
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
* @author Kief Morris ([EMAIL PROTECTED])
*/
@@ -264,6 +264,7 @@
public void setStore(Store store) {
this.store = store;
+ store.setManager(this);
}
@@ -595,11 +596,9 @@
if (debug >= 1)
log("Force random number initialization completed");
- // Create the FileStore object.
- // FIXME: Do this properly (configurable)
- store = new FileStore();
- store.setManager (this);
- if (store instanceof Lifecycle)
+ if (store == null)
+ log("No Store configured");
+ else if (store instanceof Lifecycle)
((Lifecycle)store).start();
// Start the background reaper thread
