Allow to test with APR.

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

diff --git a/java/org/apache/catalina/startup/Tomcat.java b/java/org/apache/catalina/startup/Tomcat.java
index 84e6583..9c25635 100644 (file)
--- 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 9199ae9..c770576 100644 (file)
--- 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());