Author: csutherl Date: Thu Jan 17 02:25:03 2019 New Revision: 1851494 URL: http://svn.apache.org/viewvc?rev=1851494&view=rev Log: Log a message when using a Connector that requires Apr without enabling the AprLifecycleListener first
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1851494&r1=1851493&r2=1851494&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Thu Jan 17 02:25:03 2019 @@ -957,8 +957,12 @@ public class Connector extends Lifecycle setParseBodyMethods(getParseBodyMethods()); } + if (protocolHandler.isAprRequired() && !AprLifecycleListener.isInstanceCreated()) { + throw new LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoAprListener", + getProtocolHandlerClassName())); + } if (protocolHandler.isAprRequired() && !AprLifecycleListener.isAprAvailable()) { - throw new LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoApr", + throw new LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoAprLibrary", getProtocolHandlerClassName())); } if (AprLifecycleListener.isAprAvailable() && AprLifecycleListener.getUseOpenSSL() && Modified: tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1851494&r1=1851493&r2=1851494&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties [UTF-8] (original) +++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties [UTF-8] Thu Jan 17 02:25:03 2019 @@ -29,7 +29,8 @@ coyoteConnector.parseBodyMethodNoTrace=T coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed coyoteConnector.protocolHandlerInitializationFailed=Protocol handler initialization failed coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler instantiation failed -coyoteConnector.protocolHandlerNoApr=The configured protocol [{0}] requires the APR/native library which is not available +coyoteConnector.protocolHandlerNoAprListener=The configured protocol [{0}] requires the AprLifecycleListener which is not available +coyoteConnector.protocolHandlerNoAprLibrary=The configured protocol [{0}] requires the APR/native library which is not available coyoteConnector.protocolHandlerPauseFailed=Protocol handler pause failed coyoteConnector.protocolHandlerResumeFailed=Protocol handler resume failed coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1851494&r1=1851493&r2=1851494&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Thu Jan 17 02:25:03 2019 @@ -421,4 +421,8 @@ public class AprLifecycleListener return useOpenSSL; } + public static boolean isInstanceCreated() { + return instanceCreated; + } + } Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1851494&r1=1851493&r2=1851494&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 17 02:25:03 2019 @@ -84,6 +84,10 @@ Correct a bug exposed in 9.0.14 and ensure that the Tomcat terminates in a timely manner when running as a service. (markt) </fix> + <fix> + Log a message when using a Connector that requires Apr without enabling + the AprLifecycleListener first. (csutherl) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org