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 4dfb30b Update optimisation for java.lang.Record added in Java 14
4dfb30b is described below
commit 4dfb30b66990f9a4a027bbdde541e375e7082d6b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Dec 16 16:08:47 2019 +0000
Update optimisation for java.lang.Record added in Java 14
---
java/javax/el/ImportHandler.java | 3 ++-
test/javax/el/TestImportHandlerStandardPackages.java | 6 ++----
webapps/docs/changelog.xml | 10 ++++++++++
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/java/javax/el/ImportHandler.java b/java/javax/el/ImportHandler.java
index 230cfaf..b31a75f 100644
--- a/java/javax/el/ImportHandler.java
+++ b/java/javax/el/ImportHandler.java
@@ -137,7 +137,7 @@ public class ImportHandler {
standardPackages.put("javax.servlet.jsp", servletJspClassNames);
Set<String> javaLangClassNames = new HashSet<>();
- // Taken from Java 11 EA18 Javadoc
+ // Taken from Java 14 EA27 Javadoc
// Interfaces
javaLangClassNames.add("Appendable");
javaLangClassNames.add("AutoCloseable");
@@ -179,6 +179,7 @@ public class ImportHandler {
javaLangClassNames.add("Process");
javaLangClassNames.add("ProcessBuilder");
javaLangClassNames.add("ProcessBuilder.Redirect");
+ javaLangClassNames.add("Record");
javaLangClassNames.add("Runtime");
javaLangClassNames.add("Runtime.Version");
javaLangClassNames.add("RuntimePermission");
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java
b/test/javax/el/TestImportHandlerStandardPackages.java
index 2aa2bbb..9637aa6 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -59,10 +59,8 @@ public class TestImportHandlerStandardPackages {
// 9 (and later) so it is not necessary that this is executed on
// every test run. The intention is that it will catch new classes
// when the tests are run on a newer JRE.
- // The latest versions of the JRE where this test is known to pass
are
- // - OpenJDK 11.0.1
- // - OpenJDK 12 EA 26
- // - OpenJDK 13 EA 02
+ // The latest version of the JRE where this test is known to pass
is
+ // - OpenJDK 14 EA 27
if (!JreCompat.isJre9Available()) {
return;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bbe52b5..a962c3a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -77,6 +77,16 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ Update the performance optimisation for using expressions in tags that
+ depend on uninitialised tag attributes with implied scope to make the
+ performance optimisation aware of the new public class
+ (<code>java.lang.Record</code>) added in Java 14. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
