From 9bb865b234c3e400c2afcfafa5ce30724f846b86 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 6 Jun 2010 17:36:34 +0000
Subject: [PATCH] Use STRICT_SERVLET_COMPLIANCE to override the default for
 ACTIVITY_CHECK to align behaviour with other system properties

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@951909 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/catalina/session/StandardSession.java    | 20 +++++++++++++++++---
 webapps/docs/config/systemprops.xml                 | 21 +++++++++++----------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index 40a955da4..0d3e30f72 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -84,14 +84,28 @@ import org.apache.catalina.security.SecurityUtil;
 public class StandardSession
     implements HttpSession, Session, Serializable {
 
+    protected static final boolean STRICT_SERVLET_COMPLIANCE;
 
-    protected static final boolean ACTIVITY_CHECK = 
-        Globals.STRICT_SERVLET_COMPLIANCE
-        || Boolean.valueOf(System.getProperty("org.apache.catalina.session.StandardSession.ACTIVITY_CHECK", "false")).booleanValue();
+    protected static final boolean ACTIVITY_CHECK;
 
 
     // ----------------------------------------------------------- Constructors
 
+    static {
+        STRICT_SERVLET_COMPLIANCE = Boolean.valueOf(System.getProperty(
+                "org.apache.catalina.STRICT_SERVLET_COMPLIANCE",
+                "false")).booleanValue();
+        
+        String activityCheck = System.getProperty(
+                "org.apache.catalina.session.StandardSession.ACTIVITY_CHECK");
+        if (activityCheck == null) {
+            ACTIVITY_CHECK = STRICT_SERVLET_COMPLIANCE;
+        } else {
+            ACTIVITY_CHECK =
+                Boolean.valueOf(activityCheck).booleanValue();
+        }
+    }
+    
 
     /**
      * Construct a new Session associated with the specified Manager.
diff --git a/webapps/docs/config/systemprops.xml b/webapps/docs/config/systemprops.xml
index 2eaac8a4a..5e7ce12dc 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -239,6 +239,7 @@
       <li>
         The default value will be changed for:
         <ul>
+        <li><code>org.apache.catalina.session.StandardSession.ACTIVITY_CHECK</code></li>
         <li><code>org.apache.tomcat.util.http.ServerCookie.ALWAYS_ADD_EXPIRES</code>.</li>
         <li><code>org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR</code>.</li>
         <li><code>org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING</code>.</li>
@@ -277,16 +278,6 @@
     </property>
 
     <property
-    name="org.apache.catalina.session. StandardSession.ACTIVITY_CHECK">
-      <p>If this is <code>true</code> or if
-      <code>org.apache.catalina.STRICT_SERVLET_COMPLIANCE</code> is
-      <code>true</code> Tomcat will track the number of active requests for each
-      session. When determining if a session is valid, any session with at least
-      one active request will always be considered valid. If not specified, the
-      default value of <code>false</code> will be used.</p>
-    </property>
-
-    <property
     name="org.apache.tomcat.util.http. ServerCookie.ALLOW_EQUALS_IN_VALUE">
       <p>If this is <code>true</code> Tomcat will allow <code>=</code>
       characters when parsing unquoted cookie values. If <code>false</code>,
@@ -352,6 +343,16 @@
       <code>JSESSIONIDSSO</code>.</p>
     </property>
     
+    <property
+    name="org.apache.catalina.session. StandardSession.ACTIVITY_CHECK">
+      <p>If this is <code>true</code> Tomcat will track the number of active
+      requests for each session. When determining if a session is valid, any
+      session with at least one active request will always be considered valid.
+      If <code>org.apache.catalina.STRICT_SERVLET_COMPLIANCE</code> is set to
+      <code>true</code>, the default of this setting will be <code>true</code>,
+      else the default value will be <code>false</code>.</p>
+    </property>
+
   </properties>
 
 </section>
-- 
2.11.0