cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session FileStore.java JDBCStore.java ManagerBase.java PersistentManagerBase.java StandardSession.java
jfclere 2003/02/11 03:54:12
Modified:catalina/src/share/org/apache/catalina Manager.java
catalina/src/share/org/apache/catalina/session
FileStore.java JDBCStore.java ManagerBase.java
PersistentManagerBase.java StandardSession.java
Log:
Correct problems related to the persistence of sessions:
Revision ChangesPath
1.9 +10 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Manager.java
Index: Manager.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Manager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Manager.java 9 Dec 2002 15:05:55 - 1.8
+++ Manager.java 11 Feb 2003 11:54:12 - 1.9
@@ -175,6 +175,12 @@
*/
public void add(Session session);
+/**
+ * Get a session from the recycled ones or create a new empty one.
+ * The PersistentManager manager does not need to create session data
+ * because it reads it from the Store.
+ */
+public Session createEmptySession();
/**
* Add a property change listener to this component.
1.11 +6 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java
Index: FileStore.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FileStore.java9 Dec 2002 15:05:55 - 1.10
+++ FileStore.java11 Feb 2003 11:54:12 - 1.11
@@ -333,7 +333,7 @@
try {
StandardSession session =
-(StandardSession) manager.createSession();
+(StandardSession) manager.createEmptySession();
session.readObjectData(ois);
session.setManager(manager);
return (session);
@@ -385,6 +385,7 @@
public void save(Session session) throws IOException {
// Open an output stream to the specified pathname, if any
+System.out.println(save: + session.getId());
File file = file(session.getId());
if (file == null) {
return;
1.9 +5 -5
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JDBCStore.java9 Dec 2002 15:05:55 - 1.8
+++ JDBCStore.java11 Feb 2003 11:54:12 - 1.9
@@ -538,7 +538,7 @@
if(ois != null) {
try {
-_session = (StandardSession) manager.createSession();
+_session = (StandardSession) manager.createEmptySession();
_session.readObjectData(ois);
_session.setManager(manager);
} finally {
1.19 +27 -16
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/ManagerBase.java
Index: ManagerBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ManagerBase.java 6 Feb 2003 23:01:41 - 1.18
+++ ManagerBase.java 11 Feb 2003 11:54:12 - 1.19
@@ -574,18 +574,7 @@
public Session createSession() {
// Recycle or create a Session instance
-Session session = null;
-synchronized (recycled) {
-int size = recycled.size();
-if (size 0) {
-session = (Session) recycled.get(size - 1);
-recycled.remove(size - 1);
-}
-}
-if (session != null)
-session.setManager(this);
-else
-session = new StandardSession(this);
+Session session = createEmptySession();
// Initialize the properties of the new session and return it
session.setNew(true);
@@ -615,6 +604,28 @@
return (session);
+}
+
+
+/**
+ * Get a session from the recycled ones or create a new empty one.
+ * The PersistentManager manager does not need to create session data
+ * because it reads it from the Store.
+ */
+public Session createEmptySession() {
+Session session =
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session FileStore.java JDBCStore.java ManagerBase.java PersistentManagerBase.java
jfclere 2002/11/30 04:43:14
Modified:catalina/src/share/org/apache/catalina Manager.java
catalina/src/share/org/apache/catalina/session
FileStore.java JDBCStore.java ManagerBase.java
PersistentManagerBase.java
Log:
Add createEmptySession to Manager to improve the PersistentManager logics.
Revision ChangesPath
1.7 +10 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Manager.java
Index: Manager.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Manager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Manager.java 19 Sep 2002 22:55:47 - 1.6
+++ Manager.java 30 Nov 2002 12:43:14 - 1.7
@@ -183,6 +183,12 @@
*/
public void addPropertyChangeListener(PropertyChangeListener listener);
+/**
+ * Get a session from the recycled ones or create a new empty one.
+ * The PersistentManager manager does not need to create session data
+ * because it reads it from the Store.
+ */
+public Session createEmptySession();
/**
* Construct and return a new session object, based on the default
1.9 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java
Index: FileStore.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FileStore.java19 Nov 2002 16:21:16 - 1.8
+++ FileStore.java30 Nov 2002 12:43:14 - 1.9
@@ -333,7 +333,7 @@
try {
StandardSession session =
-(StandardSession) manager.createSession();
+(StandardSession) manager.createEmptySession();
session.readObjectData(ois);
session.setManager(manager);
return (session);
1.7 +5 -5
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JDBCStore.java20 Sep 2002 14:05:14 - 1.6
+++ JDBCStore.java30 Nov 2002 12:43:14 - 1.7
@@ -538,7 +538,7 @@
if(ois != null) {
try {
-_session = (StandardSession) manager.createSession();
+_session = (StandardSession) manager.createEmptySession();
_session.readObjectData(ois);
_session.setManager(manager);
} finally {
1.13 +27 -17
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/ManagerBase.java
Index: ManagerBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ManagerBase.java 19 Sep 2002 22:55:48 - 1.12
+++ ManagerBase.java 30 Nov 2002 12:43:14 - 1.13
@@ -560,18 +560,7 @@
public Session createSession() {
// Recycle or create a Session instance
-Session session = null;
-synchronized (recycled) {
-int size = recycled.size();
-if (size 0) {
-session = (Session) recycled.get(size - 1);
-recycled.remove(size - 1);
-}
-}
-if (session != null)
-session.setManager(this);
-else
-session = new StandardSession(this);
+Session session = createEmptySession();
// Initialize the properties of the new session and return it
session.setNew(true);
@@ -583,7 +572,6 @@
// @todo Move appending of jvmRoute generateSessionId()???
if (jvmRoute != null) {
sessionId += '.' + jvmRoute;
-session.setId(sessionId);
}
/*
synchronized (sessions) {
@@ -595,6 +583,28 @@
return (session);
+}
+
+
+/**
+ * Get a session from the recycled ones or create a new empty one.
+ * The PersistentManager manager does not need to create session data
+ * because it reads it from the Store.
+ */
+public Session createEmptySession() {
+Session
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session FileStore.java
jfclere 2002/11/19 08:21:16
Modified:catalina/src/share/org/apache/catalina/session
FileStore.java
Log:
Check for the existence of the file.
Revision ChangesPath
1.8 +8 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java
Index: FileStore.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FileStore.java18 Mar 2002 18:56:21 - 1.7
+++ FileStore.java19 Nov 2002 16:21:16 - 1.8
@@ -290,6 +290,10 @@
if (file == null) {
return (null);
}
+
+if (! file.exists()) {
+return (null);
+}
if (debug = 1) {
log(sm.getString(getStoreName()+.loading,
id, file.getAbsolutePath()));
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session FileStore.java
craigmcc02/03/18 10:56:21
Modified:catalina/src/share/org/apache/catalina/session
FileStore.java
Log:
Refactor FileStore to clean up the code, and to create the storage directory
if it does not already exist.
PR: Bugzilla #7171
Submitted by: Peter Rossbach pr at webapp.de
Revision ChangesPath
1.7 +99 -80
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java
Index: FileStore.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileStore.java22 Jul 2001 20:25:12 - 1.6
+++ FileStore.java18 Mar 2002 18:56:21 - 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java,v
1.6 2001/07/22 20:25:12 pier Exp $
- * $Revision: 1.6 $
- * $Date: 2001/07/22 20:25:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java,v
1.7 2002/03/18 18:56:21 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/03/18 18:56:21 $
*
*
*
@@ -77,9 +77,7 @@
import java.io.ObjectOutputStream;
import java.io.ObjectStreamClass;
import java.io.Serializable;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
+import java.util.ArrayList;
import javax.servlet.ServletContext;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
@@ -96,7 +94,7 @@
* saved are still subject to being expired based on inactivity.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2001/07/22 20:25:12 $
+ * @version $Revision: 1.7 $ $Date: 2002/03/18 18:56:21 $
*/
public final class FileStore
@@ -117,7 +115,8 @@
/**
* The pathname of the directory in which Sessions are stored.
- * Relative to the temp directory for the web application.
+ * This may be an absolute pathname, or a relative path that is
+ * resolved against the temporary work directory for this application.
*/
private String directory = .;
@@ -206,15 +205,20 @@
*/
public int getSize() throws IOException {
-String[] files = getDirectoryFile().list();
+// Acquire the list of files in our storage directory
+File file = directory();
+if (file == null) {
+return (0);
+}
+String files[] = file.list();
// Figure out which files are sessions
int keycount = 0;
for (int i = 0; i files.length; i++) {
-if (files[i].endsWith(FILE_EXT))
+if (files[i].endsWith(FILE_EXT)) {
keycount++;
+}
}
-
return (keycount);
}
@@ -222,6 +226,23 @@
// - Public Methods
+
+/**
+ * Remove all of the Sessions in this Store.
+ *
+ * @exception IOException if an input/output error occurs
+ */
+public void clear()
+throws IOException {
+
+String[] keys = keys();
+for (int i = 0; i keys.length; i++) {
+remove(keys[i]);
+}
+
+}
+
+
/**
* Return an array containing the session identifiers of all Sessions
* currently saved in this Store. If there are no such Sessions, a
@@ -231,30 +252,22 @@
*/
public String[] keys() throws IOException {
-String[] files = getDirectoryFile().list();
-
-// Figure out which files contain sessions
-int keycount = 0;
-for (int i = 0; i files.length; i++) {
-if (files[i].endsWith(FILE_EXT))
-keycount++;
-else
-files[i] = null;
+// Acquire the list of files in our storage directory
+File file = directory();
+if (file == null) {
+return (new String[0]);
}
+String files[] = file.list();
-// Get keys from relevant filenames.
-String[] keys = new String[keycount];
-if (keycount 0) {
-keycount = 0;
-for (int i = 0; i files.length; i++) {
-if (files[i] != null) {
-keys[keycount] = files[i].substring (0,
files[i].lastIndexOf('.'));
-keycount++;
-}
+// Build and return the list of session identifiers
+ArrayList list = new ArrayList();
+int n = FILE_EXT.length();
+for (int i = 0; i files.length; i++) {
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session FileStore.java
craigmcc02/03/18 14:24:11
Modified:catalina/src/share/org/apache/catalina/session Tag:
tomcat_40_branch FileStore.java
Log:
Port the FileStore fix for creating the working directory if it is not there
(and the associated refactoring/cleanup) from the HEAD branch.
PR: Bugzilla #7171
Submitted by: Peter Rossbach pr at webapp.de
Revision ChangesPath
No revision
No revision
1.6.2.1 +99 -80
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java
Index: FileStore.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- FileStore.java22 Jul 2001 20:25:12 - 1.6
+++ FileStore.java18 Mar 2002 22:24:11 - 1.6.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java,v
1.6 2001/07/22 20:25:12 pier Exp $
- * $Revision: 1.6 $
- * $Date: 2001/07/22 20:25:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java,v
1.6.2.1 2002/03/18 22:24:11 craigmcc Exp $
+ * $Revision: 1.6.2.1 $
+ * $Date: 2002/03/18 22:24:11 $
*
*
*
@@ -77,9 +77,7 @@
import java.io.ObjectOutputStream;
import java.io.ObjectStreamClass;
import java.io.Serializable;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
+import java.util.ArrayList;
import javax.servlet.ServletContext;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
@@ -96,7 +94,7 @@
* saved are still subject to being expired based on inactivity.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2001/07/22 20:25:12 $
+ * @version $Revision: 1.6.2.1 $ $Date: 2002/03/18 22:24:11 $
*/
public final class FileStore
@@ -117,7 +115,8 @@
/**
* The pathname of the directory in which Sessions are stored.
- * Relative to the temp directory for the web application.
+ * This may be an absolute pathname, or a relative path that is
+ * resolved against the temporary work directory for this application.
*/
private String directory = .;
@@ -206,15 +205,20 @@
*/
public int getSize() throws IOException {
-String[] files = getDirectoryFile().list();
+// Acquire the list of files in our storage directory
+File file = directory();
+if (file == null) {
+return (0);
+}
+String files[] = file.list();
// Figure out which files are sessions
int keycount = 0;
for (int i = 0; i files.length; i++) {
-if (files[i].endsWith(FILE_EXT))
+if (files[i].endsWith(FILE_EXT)) {
keycount++;
+}
}
-
return (keycount);
}
@@ -222,6 +226,23 @@
// - Public Methods
+
+/**
+ * Remove all of the Sessions in this Store.
+ *
+ * @exception IOException if an input/output error occurs
+ */
+public void clear()
+throws IOException {
+
+String[] keys = keys();
+for (int i = 0; i keys.length; i++) {
+remove(keys[i]);
+}
+
+}
+
+
/**
* Return an array containing the session identifiers of all Sessions
* currently saved in this Store. If there are no such Sessions, a
@@ -231,30 +252,22 @@
*/
public String[] keys() throws IOException {
-String[] files = getDirectoryFile().list();
-
-// Figure out which files contain sessions
-int keycount = 0;
-for (int i = 0; i files.length; i++) {
-if (files[i].endsWith(FILE_EXT))
-keycount++;
-else
-files[i] = null;
+// Acquire the list of files in our storage directory
+File file = directory();
+if (file == null) {
+return (new String[0]);
}
+String files[] = file.list();
-// Get keys from relevant filenames.
-String[] keys = new String[keycount];
-if (keycount 0) {
-keycount = 0;
-for (int i = 0; i files.length; i++) {
-if (files[i] != null) {
-keys[keycount] = files[i].substring (0,
files[i].lastIndexOf('.'));
-keycount++;
-}
+// Build and return the list of
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session FileStore.java
kief01/04/14 03:56:29
Modified:catalina/src/share/org/apache/catalina/session
FileStore.java
Log:
Removed code which duplicates that in Manager, namely the background
thread checking for expired sessions. This involved removing implementation
of the Lifecycle and Runnable interfaces.
Also changed the log method to indicate messages as comming from FileStore
rather than Manager.
Revision ChangesPath
1.4 +9 -267
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java
Index: FileStore.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileStore.java2001/04/12 18:18:58 1.3
+++ FileStore.java2001/04/14 10:56:29 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java,v
1.3 2001/04/12 18:18:58 kief Exp $
- * $Revision: 1.3 $
- * $Date: 2001/04/12 18:18:58 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java,v
1.4 2001/04/14 10:56:29 kief Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/04/14 10:56:29 $
*
*
*
@@ -105,11 +105,11 @@
* saved are still subject to being expired based on inactivity.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/04/12 18:18:58 $
+ * @version $Revision: 1.4 $ $Date: 2001/04/14 10:56:29 $
*/
public final class FileStore
-implements Lifecycle, Runnable, Store {
+implements Store {
// - Constants
@@ -125,17 +125,12 @@
/**
- * The interval (in seconds) between checks for expired sessions.
- */
-private int checkInterval = 60;
-
-
-/**
* The pathname of the directory in which Sessions are stored.
* Relative to the temp directory for the web application.
*/
private String directory = ".";
+
/**
* A File representing the directory in which Sessions are stored.
*/
@@ -149,12 +144,6 @@
/**
- * The lifecycle event support for this component.
- */
-protected LifecycleSupport lifecycle = new LifecycleSupport(this);
-
-
-/**
* The string manager for this package.
*/
private StringManager sm =
@@ -162,30 +151,12 @@
/**
- * Has this component been started yet?
- */
-private boolean started = false;
-
-
-/**
* The property change support for this component.
*/
private PropertyChangeSupport support = new PropertyChangeSupport(this);
/**
- * The background thread.
- */
-private Thread thread = null;
-
-
-/**
- * The background thread completion semaphore.
- */
-private boolean threadDone = false;
-
-
-/**
* The Manager with which this FileStore is associated.
*/
protected Manager manager;
@@ -197,42 +168,10 @@
protected int debug = 0;
-/**
- * Name to register for the background thread.
- */
-private String threadName = "FileStore";
-
-
// - Properties
/**
- * Return the check interval (in seconds) for this Manager.
- */
-public int getCheckInterval() {
-
-return (this.checkInterval);
-
-}
-
-
-/**
- * Set the check interval (in seconds) for this Manager.
- *
- * @param checkInterval The new check interval
- */
-public void setCheckInterval(int checkInterval) {
-
-int oldCheckInterval = this.checkInterval;
-this.checkInterval = checkInterval;
-support.firePropertyChange("checkInterval",
- new Integer(oldCheckInterval),
- new Integer(this.checkInterval));
-
-}
-
-
-/**
* Return the directory path for this Store.
*/
public String getDirectory() {
@@ -495,6 +434,7 @@
}
+
/**
* Remove a property change listener from this component.
*
@@ -548,82 +488,6 @@
}
-// -- Lifecycle Methods
-
-
-/**
- * Add a lifecycle event listener to this component.
- *
- * @param listener The listener to add
- */
-public void addLifecycleListener(LifecycleListener listener) {
-
-
