Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 162E49759 for ; Mon, 25 Jun 2012 13:08:15 +0000 (UTC) Received: (qmail 43087 invoked by uid 500); 25 Jun 2012 12:54:15 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 42751 invoked by uid 500); 25 Jun 2012 12:53:58 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 42638 invoked by uid 99); 25 Jun 2012 12:53:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jun 2012 12:53:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jun 2012 12:53:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0421F2388865 for ; Mon, 25 Jun 2012 12:53:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1353501 - in /tomcat/trunk/java/org/apache: catalina/connector/ coyote/ coyote/ajp/ coyote/http11/ Date: Mon, 25 Jun 2012 12:53:28 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120625125330.0421F2388865@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Mon Jun 25 12:53:27 2012 New Revision: 1353501 URL: http://svn.apache.org/viewvc?rev=1353501&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53430 Fix problems with missing / wrong version of APR/native library when APR connector is explicitly configured. Protocol now declares if it needs the library and the connector ensures it is available if required. Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 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=1353501&r1=1353500&r2=1353501&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Mon Jun 25 12:53:27 2012 @@ -952,6 +952,13 @@ public class Connector extends Lifecycle setParseBodyMethods(getParseBodyMethods()); } + if (protocolHandler.isAprRequired() && + !AprLifecycleListener.isAprAvailable()) { + throw new LifecycleException( + sm.getString("coyoteConnector.protocolHandlerNoApr", + getProtocolHandlerClassName())); + } + try { protocolHandler.init(); } catch (Exception e) { 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=1353501&r1=1353500&r2=1353501&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Mon Jun 25 12:53:27 2012 @@ -21,6 +21,7 @@ coyoteConnector.invalidPort=The connecto 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.protocolHandlerStartFailed=Protocol handler start failed coyoteConnector.protocolHandlerPauseFailed=Protocol handler pause failed coyoteConnector.protocolHandlerResumeFailed=Protocol handler resume failed Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1353501&r1=1353500&r2=1353501&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Jun 25 12:53:27 2012 @@ -149,6 +149,12 @@ public abstract class AbstractProtocol i public void setClientCertProvider(String s) { this.clientCertProvider = s; } + @Override + public boolean isAprRequired() { + return false; + } + + // ---------------------- Properties that are passed through to the EndPoint @Override Modified: tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java?rev=1353501&r1=1353500&r2=1353501&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java (original) +++ tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java Mon Jun 25 12:53:27 2012 @@ -82,4 +82,10 @@ public interface ProtocolHandler { * Destroy the protocol (optional). */ public void destroy() throws Exception; + + + /** + * Requires APR/native library + */ + public boolean isAprRequired(); } Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1353501&r1=1353500&r2=1353501&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Mon Jun 25 12:53:27 2012 @@ -49,9 +49,16 @@ public class AjpAprProtocol extends Abst } - // ------------------------------------------------------------ Constructor + @Override + public boolean isAprRequired() { + // Override since this protocol implementation requires the APR/native + // library + return true; + } + // ------------------------------------------------------------ Constructor + public AjpAprProtocol() { endpoint = new AprEndpoint(); cHandler = new AjpConnectionHandler(this); Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1353501&r1=1353500&r2=1353501&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon Jun 25 12:53:27 2012 @@ -53,6 +53,14 @@ public class Http11AprProtocol extends A } + @Override + public boolean isAprRequired() { + // Override since this protocol implementation requires the APR/native + // library + return true; + } + + public Http11AprProtocol() { endpoint = new AprEndpoint(); cHandler = new Http11ConnectionHandler(this); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org