Author: kkolinko
Date: Mon Nov 18 12:25:21 2013
New Revision: 1543015
URL: http://svn.apache.org/r1543015
Log:
Merged r1542769 from tomcat/trunk:
Work around false positive test failure
This issue was observed on Tomcat 7 buildbot,
e.g. Builder tomcat-7-trunk Build #1553
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1542769
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1543015&r1=1543014&r2=1543015&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
Mon Nov 18 12:25:21 2013
@@ -169,6 +169,11 @@ public class TestRegistration extends To
combinedRealm.addRealm(nullRealm);
ctx.setRealm(combinedRealm);
+ // Disable keep-alive otherwise request processing threads in
keep-alive
+ // won't shut down fast enough with BIO to de-register the processor
+ // triggering a test failure
+ tomcat.getConnector().setAttribute("maxKeepAliveRequests",
Integer.valueOf(1));
+
tomcat.start();
getUrl("http://localhost:"; + getPort());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
