Author: markt
Date: Fri Feb 2 11:06:31 2018
New Revision: 1822945
URL: http://svn.apache.org/viewvc?rev=1822945&view=rev
Log:
When using Tomcat embedded, only perform Authenticator configuration once
during web application start.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1822945&r1=1822944&r2=1822945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Fri Feb 2
11:06:31 2018
@@ -966,18 +966,17 @@ public class Tomcat {
Context context = (Context) event.getLifecycle();
if (event.getType().equals(Lifecycle.CONFIGURE_START_EVENT)) {
context.setConfigured(true);
- }
- // LoginConfig is required to process @ServletSecurity
- // annotations
- if (context.getLoginConfig() == null) {
- context.setLoginConfig(
- new LoginConfig("NONE", null, null, null));
- context.getPipeline().addValve(new
NonLoginAuthenticator());
+
+ // LoginConfig is required to process @ServletSecurity
+ // annotations
+ if (context.getLoginConfig() == null) {
+ context.setLoginConfig(new LoginConfig("NONE", null,
null, null));
+ context.getPipeline().addValve(new
NonLoginAuthenticator());
+ }
}
} catch (ClassCastException e) {
}
}
-
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1822945&r1=1822944&r2=1822945&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 2 11:06:31 2018
@@ -87,6 +87,10 @@
Provide a correct <code>Allow</code> header when responding to an HTTP
<code>TRACE</code> request for a JSP with a 405 status code. (markt)
</fix>
+ <fix>
+ When using Tomcat embedded, only perform Authenticator configuration
+ once during web application start. (markt)
+ </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
