Author: remy.maucherat(a)jboss.com Date: 2010-07-02 05:37:23 -0400 (Fri, 02 Jul 2010) New Revision: 1499 Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java Log: - If the user has configured an Authenticator valve manually, call setAuthenticator. Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java =================================================================== --- trunk/java/org/apache/catalina/startup/ContextConfig.java 2010-06-29 10:33:01 UTC (rev 1498) +++ trunk/java/org/apache/catalina/startup/ContextConfig.java 2010-07-02 09:37:23 UTC (rev 1499) @@ -238,12 +238,16 @@ Pipeline pipeline = ((ContainerBase) context).getPipeline(); if (pipeline != null) { Valve basic = pipeline.getBasic(); - if ((basic != null) && (basic instanceof Authenticator)) + if ((basic != null) && (basic instanceof Authenticator)) { + context.setAuthenticator((Authenticator) basic); return; + } Valve valves[] = pipeline.getValves(); for (int i = 0; i < valves.length; i++) { - if (valves[i] instanceof Authenticator) + if (valves[i] instanceof Authenticator) { + context.setAuthenticator((Authenticator) valves[i]); return; + } } } } else {