tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r482650 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/startup/TldConfig.java tomcat/util/net/AprEndpoint.java
Date Tue, 05 Dec 2006 13:49:13 GMT
Author: remm
Date: Tue Dec  5 05:49:08 2006
New Revision: 482650

URL: http://svn.apache.org/viewvc?view=rev&rev=482650
Log:
- Disable TLD cache for now until further refactoring, since I have found it was not consistent
with Jasper.
- Don't mutate keepAliveTimeout value in AprEndpoint.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
    tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?view=diff&rev=482650&r1=482649&r2=482650
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Tue Dec  5 05:49:08
2006
@@ -255,7 +255,7 @@
         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

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?view=diff&rev=482650&r1=482649&r2=482650
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Dec  5 05:49:08
2006
@@ -652,11 +652,6 @@
             }
         }
         
-        // 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 @@
         
         /**
          * 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



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


Mime
View raw message