kief 01/04/12 13:24:38
Modified: catalina/src/share/org/apache/catalina/session
PersistentManager.java
Log:
Fixed an error I made in applying Bip's patch which had neutered the
backup() method.
Revision Changes Path
1.6 +12 -16
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PersistentManager.java 2001/04/12 18:18:57 1.5
+++ PersistentManager.java 2001/04/12 20:24:36 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManager.java,v
1.5 2001/04/12 18:18:57 kief Exp $
- * $Revision: 1.5 $
- * $Date: 2001/04/12 18:18:57 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManager.java,v
1.6 2001/04/12 20:24:36 kief Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/04/12 20:24:36 $
*
* ====================================================================
*
@@ -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.5 $
+ * @version $Revision: 1.6 $
* @author Kief Morris ([EMAIL PROTECTED])
*/
@@ -376,7 +376,7 @@
if (this.minIdleSwap == min)
return;
int oldMinIdleSwap = this.minIdleSwap;
- this.minIdleSwap = min;
+ this.minIdleSwap = min;
support.firePropertyChange("minIdleSwap",
new Integer(oldMinIdleSwap),
new Integer(this.minIdleSwap));
@@ -471,8 +471,9 @@
/**
* Load any currently active sessions that were previously unloaded
- * to the appropriate persistence mechanism, if any. If persistence is not
- * supported, this method returns without doing anything.
+ * or backed up to the appropriate persistence mechanism, if any.
+ * If persistence is not supported, this method returns without doing
+ * anything.
*
* @exception ClassNotFoundException if a serialized class cannot be
* found during the reload
@@ -498,7 +499,6 @@
}
return;
-
}
String[] ids = store.keys();
@@ -700,7 +700,6 @@
if (isSessionStale(session, timeNow))
session.expire();
}
-
}
@@ -896,18 +895,15 @@
|| isSessionStale(session, System.currentTimeMillis()))
return;
+ try {
+ store.save(session);
+ } catch (IOException e) {
+ log(sm.getString
+ ("persistentManager.serializeError", session.getId(), e));
+ throw e;
+ }
+
}
-
-
- /**
- * Read the session in from Store, overriding the copy in
- * the Manager's memory.
- */
-// private void recover() throws IOException {
-
- // FIXME: Do something
-
-// }
/**
