Author: markt
Date: Thu Dec 26 23:59:25 2013
New Revision: 1553605
URL: http://svn.apache.org/r1553605
Log:
Fix NPEs in test
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java?rev=1553605&r1=1553604&r2=1553605&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
Thu Dec 26 23:59:25 2013
@@ -24,6 +24,7 @@ import org.junit.Test;
import org.apache.catalina.Wrapper;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.jasper.servlet.JasperInitializer;
public class TestDefaultInstanceManager extends TomcatBaseTest {
@@ -73,6 +74,8 @@ public class TestDefaultInstanceManager
StandardContext ctxt = (StandardContext) tomcat.addContext(
null, "/test", appDir.getAbsolutePath());
+ ctxt.addServletContainerInitializer(new JasperInitializer(), null);
+
// Configure the defaults and then tweak the JSP servlet settings
// Note: Min value for maxLoadedJsps is 2
Tomcat.initWebappDefaults(ctxt);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
