Remove empty comment

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

diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index 4ca0b75..a0f2498 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -93,8 +93,6 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
     public long getSelectorTimeout() {
         return ((NioEndpoint)endpoint).getSelectorTimeout();
     }
-    // *
-
     
     public void setAcceptorThreadPriority(int threadPriority) {
         ((NioEndpoint)endpoint).setAcceptorThreadPriority(threadPriority);

diff --git a/test/org/apache/catalina/comet/TestCometProcessor.java b/test/org/apache/catalina/comet/TestCometProcessor.java
index d63576e..53e0a89 100644 (file)
--- a/test/org/apache/catalina/comet/TestCometProcessor.java
+++ b/test/org/apache/catalina/comet/TestCometProcessor.java
@@ -124,6 +124,7 @@ public class TestCometProcessor extends TomcatBaseTest {
 
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();
+        tomcat.getConnector().setAttribute("connectionTimeout", "200000");
         Context root = tomcat.addContext("", TEMP_DIR);
         Tomcat.addServlet(root, "comet", new SimpleCometServlet());
         root.addServletMapping("/", "comet");
@@ -132,7 +133,8 @@ public class TestCometProcessor extends TomcatBaseTest {
         // Create connection to Comet servlet
         final Socket socket =
             SocketFactory.getDefault().createSocket("localhost", getPort());
-        socket.setSoTimeout(10000);
+        socket.setSoTimeout(100000);
+        System.out.println(socket.getLocalPort());
         
         final OutputStream os = socket.getOutputStream();
         String requestLine = "POST http://localhost:" + getPort() +
@@ -160,7 +162,12 @@ public class TestCometProcessor extends TomcatBaseTest {
             Thread.sleep(100);
             count ++;
         }
-
+        System.out.println("Writer sent " + writeThread.getPingCount() +
+                " pings");
+        if (writeThread.isAlive()) {
+            System.out.println("Writer not stopped");
+        }
+        
         // Wait for the read thread to stop
         count = 0;
         while (readThread.isAlive() && count < 100) {
@@ -228,12 +235,13 @@ public class TestCometProcessor extends TomcatBaseTest {
 
     private static class PingWriterThread extends Thread {
         
-        private int pingCount;
+        private int maxPingCount;
+        private volatile int pingCount;
         private OutputStream os;
         private volatile Exception e = null;
 
-        public PingWriterThread(int pingCount, OutputStream os) {
-            this.pingCount = pingCount;
+        public PingWriterThread(int maxPingCount, OutputStream os) {
+            this.maxPingCount = maxPingCount;
             this.os = os;
         }
 
@@ -241,10 +249,14 @@ public class TestCometProcessor extends TomcatBaseTest {
             return e;
         }
 
+        public int getPingCount() {
+            return pingCount;
+        }
+
         @Override
         public void run() {
             try {
-                for (int i = 0; i < pingCount; i++) {
+                for (pingCount = 0; pingCount < maxPingCount; pingCount++) {
                     os.write("4\r\n".getBytes());
                     os.write("PING\r\n".getBytes());
                     os.flush();