- Disable TLD cache for now until further refactoring, since I have found it was...

- Don't mutate keepAliveTimeout value in AprEndpoint.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@482650 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/startup/TldConfig.java b/java/org/apache/catalina/startup/TldConfig.java
index 5affe35..91d0d8e 100644 (file)
--- a/java/org/apache/catalina/startup/TldConfig.java
+++ b/java/org/apache/catalina/startup/TldConfig.java
@@ -255,7 +255,7 @@ public final class TldConfig  {
         if (context instanceof StandardContext) {
             File workDir= (File)
                 ((StandardContext)context).getServletContext().getAttribute(Globals.WORK_DIR_ATTR);
-            tldCache=new File( workDir, "tldCache.ser");
+            //tldCache=new File( workDir, "tldCache.ser");
         }
 
         // Option to not rescan

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 6d6b000..d52e001 100644 (file)
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -652,11 +652,6 @@ public class AprEndpoint {
             }
         }
         
-        // Initialize keepalive timeout if it has not been set
-        if (keepAliveTimeout == -1) {
-            keepAliveTimeout = soTimeout;
-        }
-        
         // Delay accepting of new connections until data is available
         // Only Linux kernels 2.4 + have that implemented
         // on other platforms this call is noop and will return APR_ENOTIMPL.
@@ -1151,12 +1146,15 @@ public class AprEndpoint {
         
         /**
          * Create the poller. With some versions of APR, the maximum poller size will
-         * be 62 (reocmpiling APR is necessary to remove this limitation).
+         * be 62 (recompiling APR is necessary to remove this limitation).
          */
         protected void init() {
             pool = Pool.create(serverSockPool);
             int size = pollerSize / pollerThreadCount;
             int timeout = keepAliveTimeout;
+            if (timeout < 0) {
+                timeout = soTimeout;
+            }
             if (comet) {
                 // FIXME: Find an appropriate timeout value, for now, "longer than usual"
                 // semms appropriate