Author: markt
Date: Mon Apr 16 14:00:35 2018
New Revision: 1829276
URL: http://svn.apache.org/viewvc?rev=1829276&view=rev
Log:
Follow-up to r1828946
Init TesterSupport early else it calls Library.terminate() at the wrong point
and triggers a JVM crash due to the global pool being null.
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1829276&r1=1829275&r2=1829276&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Mon Apr
16 14:00:35 2018
@@ -66,6 +66,7 @@ import org.apache.catalina.webresources.
import org.apache.coyote.http11.Http11NioProtocol;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
+import org.apache.tomcat.util.net.TesterSupport;
import org.apache.tomcat.util.scan.StandardJarScanFilter;
import org.apache.tomcat.util.scan.StandardJarScanner;
@@ -74,6 +75,14 @@ import org.apache.tomcat.util.scan.Stand
* don't have to keep writing the cleanup code.
*/
public abstract class TomcatBaseTest extends LoggingBaseTest {
+
+ /*
+ * Ensures APR Library.initialize() and Library.terminate() don't interfere
+ * with the calls from the Lifecycle listener and trigger a JVM crash
+ */
+ @SuppressWarnings("unused")
+ private static final boolean ignored = TesterSupport.OPENSSL_AVAILABLE;
+
private Tomcat tomcat;
private boolean accessLogEnabled = false;
protected static final int DEFAULT_CLIENT_TIMEOUT_MS = 300_000;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
