Revert r1003552 & r1003550 as it had a significant negative performance impact (order...

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

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 0eeabba..a657192 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -937,9 +937,6 @@ public class NioEndpoint extends AbstractEndpoint {
         
         protected volatile int keyCount = 0;
 
-        private static final int JVM_BUG_THRESHOLD = 16;
-        private volatile int jvmBugCount = 0; 
-        
         public Poller() throws IOException {
             this.selector = Selector.open();
         }
@@ -1091,20 +1088,7 @@ public class NioEndpoint extends AbstractEndpoint {
                             }else {
                                 keyCount = selector.keys().size();
                                 wakeupCounter.set(-1);
-                                long before = System.currentTimeMillis();
                                 keyCount = selector.select(selectorTimeout);
-                                long after = System.currentTimeMillis();
-                                if (keyCount == 0 &&
-                                        (after - before) < selectorTimeout/2) {
-                                    jvmBugCount++;
-                                    if (jvmBugCount > JVM_BUG_THRESHOLD) {
-                                        // TODO If bug 49890 shows no signs of
-                                        // update after a suitable period of
-                                        // time, remove the jvm bug code
-                                        log.error(sm.getString(
-                                                "endpoint.err.jvmbug"));
-                                    }
-                                }
                             }
                             wakeupCounter.set(0);
                         }

diff --git a/java/org/apache/tomcat/util/net/res/LocalStrings.properties b/java/org/apache/tomcat/util/net/res/LocalStrings.properties
index 2d05910..bb70316 100644 (file)
--- a/java/org/apache/tomcat/util/net/res/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/res/LocalStrings.properties
@@ -42,5 +42,3 @@ endpoint.sendfile.error=Unexpected sendfile error
 endpoint.sendfile.addfail=Sendfile failure: [{0}] {1}
 endpoint.sendfile.nosupport=Disabling sendfile, since either the APR version or the system doesn't support it
 endpoint.warn.noInsecureReneg=Secure renegotation is not supported by the SSL library {0}
-endpoint.err.jvmbug=The poller for the NIO connector may have entered an error state triggered by a JVM bug. See bug 49890 for more information. If you see this message with a 1.6.0u18 or later JVM and a 2.6 or later kernel please update the Tomcat bug with exact version information.
-  
\ No newline at end of file

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f712942..45f7149 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -59,7 +59,7 @@
       <fix>
         <bug>49209</bug>: Prevent possible AccessControlException during
         undeployment when running with a security manager. Patch provided by
-        Sylvain Laurent. (markt)
+        Sylvain Laurent.
       </fix>
       <fix>
         <bug>49657</bug>: Handle CGI executables with spaces in the path.
@@ -244,12 +244,6 @@
         <bug>49860</bug>: Add support for trailing headers in chunked HTTP
         requests. (markt)
       </fix>
-      <add>
-        <bug>49890</bug>: Detect when NIO connector encounters a known JVM bug
-        on Linux and log an error to help determine if the bug is still present
-        ort not. The JVM bug should be fixed for 2.6 kernels and the 1.6.0u18
-        JVMs and later. (markt)
-      </add>
     </changelog>
   </subsection>
   <subsection name="Jasper">