Merge pull request #1241 from lprimak/remove-jetty-workaround

Jakarta EE: Remove jetty workaround
apache · Dec 20, 2023 · 6ecb862 · 6ecb862
2 parents fc3bc58 + de4dfde
commit 6ecb862
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormResubmitSupportCookies.java b/support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormResubmitSupportCookies.java
@@ -70,8 +70,9 @@ static int getCookieAge(ServletRequest request, org.apache.shiro.mgt.SecurityMan
         } else {
             try {
                 return (int) Duration.ofMinutes(request.getServletContext().getSessionTimeout()).toSeconds();
-            } catch (Throwable e) {
-                // workaround for https://github.com/eclipse/jetty.project/issues/8556
+            } catch (NoSuchMethodError noSuchMethodError) {
+                // Older servers (e.g. Jetty 9.x) do not support getSessionTimeout() at all
+                log.debug("ServletContext.getSessionTimeout() not supported", noSuchMethodError);
                 return (int) Duration.ofHours(1).toSeconds();
             }
         }