This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 998390ca3e One more location
998390ca3e is described below
commit 998390ca3e578e73e9cbcfee5bb7b2f1dd96c766
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]
