Fix defect 43701

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@618059 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 9802ba0..d213fb9 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -813,6 +813,13 @@ public class NioEndpoint {
                 workers = new WorkerStack(maxThreads);
             }
 
+            // Start poller thread
+            poller = new Poller();
+            Thread pollerThread = new Thread(poller, getName() + "-ClientPoller");
+            pollerThread.setPriority(threadPriority);
+            pollerThread.setDaemon(true);
+            pollerThread.start();
+
             // Start acceptor threads
             for (int i = 0; i < acceptorThreadCount; i++) {
                 Thread acceptorThread = new Thread(new Acceptor(), getName() + "-Acceptor-" + i);
@@ -820,13 +827,6 @@ public class NioEndpoint {
                 acceptorThread.setDaemon(daemon);
                 acceptorThread.start();
             }
-
-            // Start poller thread
-            poller = new Poller();
-            Thread pollerThread = new Thread(poller, getName() + "-ClientPoller");
-            pollerThread.setPriority(threadPriority);
-            pollerThread.setDaemon(true);
-            pollerThread.start();
         }
     }
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5bf2b66..2754ff3 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -35,6 +35,8 @@
 <section name="Tomcat 6.0.15 (remm)">
   <subsection name="General">
     <changelog>
+      <fix><bug>43701</bug>: Start acceptor thread before poller thread
+      </fix>
       <update>Fix the MD5 file contents in distribution</update>
       <update>
         Add ANT script to be able to publish signed Tomcat JAR's to ASF Maven repo (fhanik)