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/21 17:55:28 UTC
[tomcat] branch 8.5.x updated: Fix use of useInstanceManagerForTags
with Tags that are inner classes
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 73749b6 Fix use of useInstanceManagerForTags with Tags that are inner classes
73749b6 is described below
commit 73749b61eddc40a5a99fb8339a04f41501616afb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 21 15:22:11 2021 +0100
Fix use of useInstanceManagerForTags with Tags that are inner classes
---
java/org/apache/jasper/compiler/Generator.java | 11 ++++++-----
webapps/docs/changelog.xml | 5 +++++
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index c7f984e..0a83cb7 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2384,7 +2384,7 @@ class Generator {
out.print(tagHandlerVar);
out.println("_reused = false;");
} else {
- writeNewInstance(tagHandlerVar, tagHandlerClassName);
+ writeNewInstance(tagHandlerVar, tagHandlerClass);
}
// Wrap use of tag in try/finally to ensure clean-up takes place
@@ -2461,7 +2461,8 @@ class Generator {
n.setEndJavaLine(out.getJavaLine());
}
- private void writeNewInstance(String tagHandlerVar, String tagHandlerClassName) {
+ private void writeNewInstance(String tagHandlerVar, Class<?> tagHandlerClass) {
+ String tagHandlerClassName = tagHandlerClass.getCanonicalName();
out.printin(tagHandlerClassName);
out.print(" ");
out.print(tagHandlerVar);
@@ -2471,7 +2472,8 @@ class Generator {
out.print(tagHandlerClassName);
out.print(")");
out.print("_jsp_getInstanceManager().newInstance(\"");
- out.print(tagHandlerClassName);
+ // Need the binary name here, not the canonical name
+ out.print(tagHandlerClass.getName());
out.println("\", this.getClass().getClassLoader());");
} else {
out.print("new ");
@@ -2628,8 +2630,7 @@ class Generator {
// Declare AT_END scripting variables
declareScriptingVars(n, VariableInfo.AT_END);
- String tagHandlerClassName = tagHandlerClass.getCanonicalName();
- writeNewInstance(tagHandlerVar, tagHandlerClassName);
+ writeNewInstance(tagHandlerVar, tagHandlerClass);
out.printil("try {");
out.pushIndent();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9643360..1f05fb7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,11 @@
makes it possible to define a <code><jsp-file></code> that will
not be loaded at start-up. (markt)
</update>
+ <fix>
+ Allow the JSP configuration option
+ <code>useInstanceManagerForTags</code> to be used with Tags that are
+ implemented as inner classes. (markt)
+ </fix>
</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