pero 2005/04/15 13:15:45
Modified: catalina/src/share/org/apache/catalina Cluster.java
catalina/src/share/org/apache/catalina/session
ManagerBase.java
Log:
Refactoring and redesign cluster
Revision Changes Path
1.10 +6 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Cluster.java
Index: Cluster.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Cluster.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Cluster.java 5 Oct 2004 17:12:49 -0000 1.9
+++ Cluster.java 15 Apr 2005 20:15:45 -0000 1.10
@@ -78,6 +78,7 @@
* Set the protocol parameters.
*
* @param protocol The protocol used by the cluster
+ * @deprecated
*/
public void setProtocol(String protocol);
@@ -85,6 +86,7 @@
* Get the protocol used by the cluster.
*
* @return The protocol
+ * @deprecated
*/
public String getProtocol();
@@ -123,6 +125,7 @@
* not identify a currently installed web application
* @exception IOException if an input/output error occurs during
* startup
+ * @deprecated
*/
public void startContext(String contextPath) throws IOException;
@@ -151,6 +154,7 @@
* is malformed (it must be "" or start with a slash)
* @exception IllegalStateException if the specified context path
* is already attached to an existing web application
+ * @deprecated
*/
public void installContext(String contextPath, URL war);
@@ -166,6 +170,7 @@
* not identify a currently installed web application
* @exception IOException if an input/output error occurs while stopping
* the web application
+ * @deprecated
*/
public void stop(String contextPath) throws IOException;
1.42 +12 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java
Index: ManagerBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ManagerBase.java 31 Mar 2005 10:31:53 -0000 1.41
+++ ManagerBase.java 15 Apr 2005 20:15:45 -0000 1.42
@@ -767,6 +767,17 @@
session.setMaxInactiveInterval(this.maxInactiveInterval);
if (sessionId == null) {
sessionId = generateSessionId();
+ // FIXME WHy we need no duplication check?
+ /*
+ synchronized (sessions) {
+ while (sessions.get(sessionId) != null) { // Guarantee
+ // uniqueness
+ duplicates++;
+ sessionId = generateSessionId();
+ }
+ }
+ */
+
// FIXME: Code to be used in case route replacement is needed
/*
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
