You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/11/04 15:08:11 UTC

svn commit: r1636582 - in /tomcat/trunk: java/org/apache/catalina/session/ManagerBase.java webapps/docs/config/cluster-manager.xml webapps/docs/config/manager.xml

Author: markt
Date: Tue Nov  4 14:08:11 2014
New Revision: 1636582

URL: http://svn.apache.org/r1636582
Log:
Follow-up to 1636534
Remove additional references to setting session ID length on the Manager.

Modified:
    tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
    tomcat/trunk/webapps/docs/config/cluster-manager.xml
    tomcat/trunk/webapps/docs/config/manager.xml

Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1636582&r1=1636581&r2=1636582&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Tue Nov  4 14:08:11 2014
@@ -89,17 +89,6 @@ public abstract class ManagerBase extend
      */
     protected int maxInactiveInterval = 30 * 60;
 
-
-    protected static final int SESSION_ID_LENGTH_UNSET = -1;
-
-    /**
-     * The session id length of Sessions created by this Manager.
-     * The length should be set directly on the SessionIdGenerator.
-     * Setting it here is deprecated.
-     */
-    protected int sessionIdLength = SESSION_ID_LENGTH_UNSET;
-
-
     /**
      * The Java class name of the secure random number generator class to be
      * used when generating session identifiers. The random number generator
@@ -544,9 +533,6 @@ public abstract class ManagerBase extend
             setSessionIdGenerator(sessionIdGenerator);
         }
 
-        if (sessionIdLength != SESSION_ID_LENGTH_UNSET) {
-            sessionIdGenerator.setSessionIdLength(sessionIdLength);
-        }
         sessionIdGenerator.setJvmRoute(getJvmRoute());
         if (sessionIdGenerator instanceof SessionIdGeneratorBase) {
             SessionIdGeneratorBase sig = (SessionIdGeneratorBase)sessionIdGenerator;

Modified: tomcat/trunk/webapps/docs/config/cluster-manager.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-manager.xml?rev=1636582&r1=1636581&r2=1636582&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/cluster-manager.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-manager.xml Tue Nov  4 14:08:11 2014
@@ -97,13 +97,6 @@
         varied by a servlet via the
         <code>setMaxInactiveInterval</code> method of the <code>HttpSession</code> object.</p>
       </attribute>
-      <attribute name="sessionIdLength" required="false">
-       <p>The length of session ids created by this Manager, measured in bytes,
-        excluding subsequent conversion to a hexadecimal string and
-        excluding any JVM route information used for load balancing.
-        This attribute is deprecated. Set the length on a nested
-        <strong>SessionIdGenerator</strong> element instead.</p>
-      </attribute>
       <attribute name="processExpiresFrequency" required="false">
         <p>Frequency of the session expiration, and related manager operations.
         Manager operations will be done once for the specified amount of

Modified: tomcat/trunk/webapps/docs/config/manager.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/manager.xml?rev=1636582&r1=1636581&r2=1636582&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/manager.xml (original)
+++ tomcat/trunk/webapps/docs/config/manager.xml Tue Nov  4 14:08:11 2014
@@ -99,15 +99,6 @@
         varied by a servlet via the
         <code>setMaxInactiveInterval</code> method of the <code>HttpSession</code> object.</p>
       </attribute>
-
-      <attribute name="sessionIdLength" required="false">
-       <p>The length of session ids created by this Manager, measured in bytes,
-        excluding subsequent conversion to a hexadecimal string and
-        excluding any JVM route information used for load balancing.
-        This attribute is deprecated. Set the length on a nested
-        <strong>SessionIdGenerator</strong> element instead.</p>
-      </attribute>
-
     </attributes>
 
   </subsection>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org