This is an automated email from the ASF dual-hosted git repository. markt-asf pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5a63c793779ff470b289248d200fae641163c9d7 Author: Mark Thomas <[email protected]> AuthorDate: Tue Sep 15 16:19:45 2026 +0100 One more location --- java/org/apache/tomcat/websocket/PerMessageDeflate.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/websocket/PerMessageDeflate.java b/java/org/apache/tomcat/websocket/PerMessageDeflate.java index a682d21666..eaa55f8ad0 100644 --- a/java/org/apache/tomcat/websocket/PerMessageDeflate.java +++ b/java/org/apache/tomcat/websocket/PerMessageDeflate.java @@ -691,7 +691,8 @@ public class PerMessageDeflate implements Transformation { if (isServer && !serverContextTakeover || !isServer && !clientContextTakeover) { try { deflater.reset(); - } catch (NullPointerException e) { + } catch (IllegalStateException | NullPointerException e) { + // As of Java 25, the JRE throws an ISE rather than an NPE throw new IOException(sm.getString("perMessageDeflate.alreadyClosed"), e); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
