Author: markt
Date: Wed Mar 30 20:26:36 2011
New Revision: 1087064
URL: http://svn.apache.org/viewvc?rev=1087064&view=rev
Log:
Requests after the connector has been stopped may time out or return 503s -
varies by connector. Make sure the test passes with either.
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestConnector.java
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestConnector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestConnector.java?rev=1087064&r1=1087063&r2=1087064&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestConnector.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestConnector.java Wed Mar
30 20:26:36 2011
@@ -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 Tomca
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);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
