From de4dfdeda09b6d098d6e61b10494bd0dabd10f27 Mon Sep 17 00:00:00 2001 From: lprimak Date: Tue, 19 Dec 2023 20:36:56 -0600 Subject: [PATCH] enh: remove workaround for https://github.com/jetty/jetty.project/issues/8556 --- .../apache/shiro/ee/filters/FormResubmitSupportCookies.java | 5 +++-- 1 file changed, 3 insertions(+), 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 index 6a77c6e3f8..465ddde945 100644 --- 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(); } }