[tomcat] 01/02: Java 19 introduces some new classes

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit ad424c6cf9e27e4236d09e90bef6b3a5e4ca42ae
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue May 17 10:55:08 2022 +0100

    Java 19 introduces some new classes
---
 java/jakarta/el/ImportHandler.java                     | 6 +++++-
 test/jakarta/el/TestImportHandlerStandardPackages.java | 2 +-
 webapps/docs/changelog.xml                             | 8 ++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/java/jakarta/el/ImportHandler.java 
b/java/jakarta/el/ImportHandler.java
index c4d62d2303..28b21ed66f 100644
--- a/java/jakarta/el/ImportHandler.java
+++ b/java/jakarta/el/ImportHandler.java
@@ -141,7 +141,7 @@ public class ImportHandler {
         standardPackages.put("jakarta.servlet.jsp", servletJspClassNames);
 
         Set<String> javaLangClassNames = new HashSet<>();
-        // Taken from Java 14 EA27 Javadoc
+        // Based on Java 19 EA22
         // Interfaces
         javaLangClassNames.add("Appendable");
         javaLangClassNames.add("AutoCloseable");
@@ -155,6 +155,9 @@ public class ImportHandler {
         javaLangClassNames.add("Runnable");
         javaLangClassNames.add("StackWalker.StackFrame");
         javaLangClassNames.add("System.Logger");
+        javaLangClassNames.add("Thread.Builder");
+        javaLangClassNames.add("Thread.Builder.OfPlatform");
+        javaLangClassNames.add("Thread.Builder.OfVirtual");
         javaLangClassNames.add("Thread.UncaughtExceptionHandler");
         //Classes
         javaLangClassNames.add("Boolean");
@@ -238,6 +241,7 @@ public class ImportHandler {
         javaLangClassNames.add("StringIndexOutOfBoundsException");
         javaLangClassNames.add("TypeNotPresentException");
         javaLangClassNames.add("UnsupportedOperationException");
+        javaLangClassNames.add("WrongThreadException");
         //Errors
         javaLangClassNames.add("AbstractMethodError");
         javaLangClassNames.add("AssertionError");
diff --git a/test/jakarta/el/TestImportHandlerStandardPackages.java 
b/test/jakarta/el/TestImportHandlerStandardPackages.java
index ea6d8f73bf..a20b19aa72 100644
--- a/test/jakarta/el/TestImportHandlerStandardPackages.java
+++ b/test/jakarta/el/TestImportHandlerStandardPackages.java
@@ -60,7 +60,7 @@ public class TestImportHandlerStandardPackages {
             // every test run. The intention is that it will catch new classes
             // when the tests are run on a newer JRE.
             // The latest version of the JRE where this test is known to pass 
is
-            // - OpenJDK 14 EA 27
+            // - OpenJDK 19 EA 22
             if (!JreCompat.isJre9Available()) {
                 return;
             }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ef7823a8d1..c7562aaa25 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
   issues do not "pop up" wrt. others).
 -->
 <section name="Tomcat 10.0.22 (markt)" rtext="in development">
+  <subsection name="Jasper">
+    <changelog>
+      <fix>
+        Update <code>ImportHandler</code> optimisation for new classes
+        introduced in Java 19. (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Web applications">
     <changelog>
       <fix>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org