From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 20 Sep 2011 11:54:44 +0000 (+0000)
Subject: Revert accidental commit
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=928a8d7c4fc1902e95e1d5f9a865fc376a2ef562;p=tomcat7.0

Revert accidental commit

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

diff --git a/test/org/apache/catalina/comet/TestCometProcessor.java b/test/org/apache/catalina/comet/TestCometProcessor.java
index 53e0a8930..d63576e68 100644
--- a/test/org/apache/catalina/comet/TestCometProcessor.java
+++ b/test/org/apache/catalina/comet/TestCometProcessor.java
@@ -124,7 +124,6 @@ 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");
@@ -133,8 +132,7 @@ public class TestCometProcessor extends TomcatBaseTest {
         // Create connection to Comet servlet
         final Socket socket =
             SocketFactory.getDefault().createSocket("localhost", getPort());
-        socket.setSoTimeout(100000);
-        System.out.println(socket.getLocalPort());
+        socket.setSoTimeout(10000);
         
         final OutputStream os = socket.getOutputStream();
         String requestLine = "POST http://localhost:" + getPort() +
@@ -162,12 +160,7 @@ 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) {
@@ -235,13 +228,12 @@ public class TestCometProcessor extends TomcatBaseTest {
 
     private static class PingWriterThread extends Thread {
         
-        private int maxPingCount;
-        private volatile int pingCount;
+        private int pingCount;
         private OutputStream os;
         private volatile Exception e = null;
 
-        public PingWriterThread(int maxPingCount, OutputStream os) {
-            this.maxPingCount = maxPingCount;
+        public PingWriterThread(int pingCount, OutputStream os) {
+            this.pingCount = pingCount;
             this.os = os;
         }
 
@@ -249,14 +241,10 @@ public class TestCometProcessor extends TomcatBaseTest {
             return e;
         }
 
-        public int getPingCount() {
-            return pingCount;
-        }
-
         @Override
         public void run() {
             try {
-                for (pingCount = 0; pingCount < maxPingCount; pingCount++) {
+                for (int i = 0; i < pingCount; i++) {
                     os.write("4\r\n".getBytes());
                     os.write("PING\r\n".getBytes());
                     os.flush();