From cdec4a0ca8795cc9f628b3cde55b01eb58414a9e Mon Sep 17 00:00:00 2001 From: jfclere Date: Wed, 19 May 2010 16:06:51 +0000 Subject: [PATCH] Allow to test with APR. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@946250 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/startup/Tomcat.java | 5 +++-- test/org/apache/catalina/startup/TomcatBaseTest.java | 10 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/startup/Tomcat.java b/java/org/apache/catalina/startup/Tomcat.java index 84e6583f0..9c2563559 100644 --- a/java/org/apache/catalina/startup/Tomcat.java +++ b/java/org/apache/catalina/startup/Tomcat.java @@ -363,10 +363,11 @@ public class Tomcat { } // This will load Apr connector if available, // default to nio. I'm having strange problems with apr + // XXX: jfclere weird... Don't add the AprLifecycleListener then. // and for the use case the speed benefit wouldn't matter. - //connector = new Connector("HTTP/1.1"); - connector = new Connector("org.apache.coyote.http11.Http11Protocol"); + connector = new Connector("HTTP/1.1"); + // connector = new Connector("org.apache.coyote.http11.Http11Protocol"); connector.setPort(port); service.addConnector( connector ); return connector; diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java b/test/org/apache/catalina/startup/TomcatBaseTest.java index 9199ae919..c7705764b 100644 --- a/test/org/apache/catalina/startup/TomcatBaseTest.java +++ b/test/org/apache/catalina/startup/TomcatBaseTest.java @@ -32,6 +32,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.catalina.LifecycleState; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.core.StandardServer; +import org.apache.catalina.core.AprLifecycleListener; + import org.apache.tomcat.util.buf.ByteChunk; import junit.framework.TestCase; @@ -103,6 +107,12 @@ public abstract class TomcatBaseTest extends TestCase { } tomcat = new Tomcat(); + + // Add AprLifecycleListener + StandardServer server = (StandardServer) tomcat.getServer(); + AprLifecycleListener listener = new AprLifecycleListener(); + server.addLifecycleListener((LifecycleListener) listener); + tomcat.setBaseDir(tempDir.getAbsolutePath()); tomcat.getHost().setAppBase(appBase.getAbsolutePath()); -- 2.11.0