Merge branch 'main' of https://github.com/Leon-Schwandt/tomcat

Author: Leon-Schwandt

java/jakarta/servlet/http/HttpSession.java

@@ -229,5 +229,7 @@ interface Accessor {
      *
      * @throws IllegalStateException if this method is called on an invalid session
      */
-    Accessor getAccessor();
+    default Accessor getAccessor() {
+        return null;
+    }
 }

java/org/apache/tomcat/util/net/AbstractEndpoint.java

@@ -1240,6 +1240,7 @@ public void shutdownExecutor() {
             this.executor = null;
             if (executor instanceof ThreadPoolExecutor) {
                 //this is our internal one, so we need to shut it down
+                @SuppressWarnings("resource")
                 ThreadPoolExecutor tpe = (ThreadPoolExecutor) executor;
                 tpe.shutdownNow();
                 long timeout = getExecutorTerminationTimeoutMillis();

webapps/docs/changelog.xml

@@ -124,6 +124,10 @@
         <code>NullPointerException</code>, if an attempt is made to use the
         <code>AsyncContext</code> after it has been recycled. (markt)
       </fix>
+      <add>
+        Add a default implementation for <code>HttpSession.getAccessor()</code>
+        to align with the Servlet 6.1 API. (markt)
+      </add>
     </changelog>
   </subsection>
   <subsection name="Coyote">