You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/04/20 07:33:34 UTC
[tomcat] 02/04: Allow use of jsp-file without JSP based servlet
being loaded at startup
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit da5a2cde5729ffac937b4a831d16a039d06297ba
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Apr 19 20:34:39 2021 +0100
Allow use of jsp-file without JSP based servlet being loaded at startup
This is particularly useful in unit tests as west/webapp is laoded many
times and loaded the jsp-file based servlets every time has a measurable
performance impact (adds ~10% in my local tests)
---
java/org/apache/catalina/core/StandardWrapper.java | 2 +-
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java
index 234320b..f6c6b39 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -336,7 +336,7 @@ public class StandardWrapper extends ContainerBase
@Override
public int getLoadOnStartup() {
- if (isJspServlet && loadOnStartup < 0) {
+ if (isJspServlet && loadOnStartup == -1) {
/*
* JspServlet must always be preloaded, because its instance is
* used during registerJMX (when registering the JSP
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 47887cd..8d9fc53 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -130,6 +130,14 @@
Review code used to generate Java source from JSPs and tags and remove
code found to be unnecessary. (markt)
</scode>
+ <update>
+ <code><servlet></code> entries in web.xml that include a
+ <code><jsp-file></code> element and a negative
+ <code><load-no-startup></code> element that is not the default
+ value of <code>-1</code> will no longer be loaded at start-up. This
+ makes it possible to define a <code><jsp-file></code> that will
+ not be loaded at start-up. (markt)
+ </update>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org