From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 30 Mar 2011 20:26:36 +0000 (+0000)
Subject: Requests after the connector has been stopped may time out or return 503s - varies... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=402781ded15757d2fe1e4fda6e54fa4270498d95;p=tomcat7.0

Requests after the connector has been stopped may time out or return 503s - varies by connector. Make sure the test passes with either.

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

diff --git a/test/org/apache/catalina/connector/TestConnector.java b/test/org/apache/catalina/connector/TestConnector.java
index c84e3f6af..c4a2a1876 100644
--- a/test/org/apache/catalina/connector/TestConnector.java
+++ b/test/org/apache/catalina/connector/TestConnector.java
@@ -16,6 +16,8 @@
  */
 package org.apache.catalina.connector;
 
+import java.net.SocketTimeoutException;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.startup.TesterServlet;
@@ -52,8 +54,14 @@ public class TestConnector extends TomcatBaseTest {
 
         connector.stop();
 
-        rc = getUrl("http://localhost:" + getPort() + "/", bc, 1000,
-                null, null);
+        try {
+            rc = getUrl("http://localhost:" + getPort() + "/", bc, 1000,
+                    null, null);
+        } catch (SocketTimeoutException ste) {
+            // May also see this with NIO
+            // Make sure the test passes if we do
+            rc = 503;
+        }
         assertEquals(503, rc);
     }
 }