[jbossweb-commits] JBossWeb SVN: r1500 - trunk/java/org/apache/catalina/startup.
Author: remy.maucherat(a)jboss.com
Date: 2010-07-02 05:46:55 -0400 (Fri, 02 Jul 2010)
New Revision: 1500
Modified:
trunk/java/org/apache/catalina/startup/ContextConfig.java
Log:
- And only set it if it is null, just in case ...
Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java
===================================================================
--- trunk/java/org/apache/catalina/startup/ContextConfig.java 2010-07-02 09:37:23 UTC (rev
1499)
+++ trunk/java/org/apache/catalina/startup/ContextConfig.java 2010-07-02 09:46:55 UTC (rev
1500)
@@ -239,13 +239,17 @@
if (pipeline != null) {
Valve basic = pipeline.getBasic();
if ((basic != null) && (basic instanceof Authenticator)) {
- context.setAuthenticator((Authenticator) basic);
+ if (context.getAuthenticator() == null) {
+ context.setAuthenticator((Authenticator) basic);
+ }
return;
}
Valve valves[] = pipeline.getValves();
for (int i = 0; i < valves.length; i++) {
if (valves[i] instanceof Authenticator) {
- context.setAuthenticator((Authenticator) valves[i]);
+ if (context.getAuthenticator() == null) {
+ context.setAuthenticator((Authenticator) valves[i]);
+ }
return;
}
}