jfclere 2002/12/09 07:05:55
Modified: catalina/src/share/org/apache/catalina Manager.java
catalina/src/share/org/apache/catalina/session
FileStore.java JDBCStore.java
PersistentManagerBase.java
Removed: catalina/src/share/org/apache/catalina/valves
PersistentValve.java
Log:
Rollback the Manager interface changes and associated changes.
DO NOT except the persistentManagers to work correctly with 4.1.x.
Revision Changes Path
1.8 +4 -11
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Manager.java 30 Nov 2002 12:43:14 -0000 1.7
+++ Manager.java 9 Dec 2002 15:05:55 -0000 1.8
@@ -184,13 +184,6 @@
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
* settings specified by this Manager's properties. The session
* id will be assigned by this method, and available via the getId()
1.10 +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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FileStore.java 30 Nov 2002 12:43:14 -0000 1.9
+++ FileStore.java 9 Dec 2002 15:05:55 -0000 1.10
@@ -333,7 +333,7 @@
try {
StandardSession session =
- (StandardSession) manager.createEmptySession();
+ (StandardSession) manager.createSession();
session.readObjectData(ois);
session.setManager(manager);
return (session);
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JDBCStore.java 30 Nov 2002 12:43:14 -0000 1.7
+++ JDBCStore.java 9 Dec 2002 15:05:55 -0000 1.8
@@ -538,7 +538,7 @@
if(ois != null) {
try {
- _session = (StandardSession) manager.createEmptySession();
+ _session = (StandardSession) manager.createSession();
_session.readObjectData(ois);
_session.setManager(manager);
} finally {
1.12 +4 -13
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java
Index: PersistentManagerBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PersistentManagerBase.java 30 Nov 2002 12:43:14 -0000 1.11
+++ PersistentManagerBase.java 9 Dec 2002 15:05:55 -0000 1.12
@@ -660,15 +660,6 @@
}
- /**
- * Remove this Session from the active Sessions for this Manager,
- * but not from the Store. (Used by the PersistentValve)
- *
- * @param session Session to be removed
- */
- public void removeSuper(Session session) {
- super.remove (session);
- }
/**
* Save all currently active sessions in the appropriate persistence
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
