This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new b81a3f9554 Fix backport of NPE fixes
b81a3f9554 is described below
commit b81a3f955416062e20d1ff4fb64b1493dedd7601
Author: Mark Thomas <[email protected]>
AuthorDate: Thu May 21 15:26:22 2026 +0100
Fix backport of NPE fixes
---
java/org/apache/catalina/core/AsyncContextImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java
b/java/org/apache/catalina/core/AsyncContextImpl.java
index e22dffba67..bee81a8a4f 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -195,7 +195,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
path = path.substring(cpath.length());
}
Context context = this.context;
- if (context == null || context.getDispatchersUseEncodedPaths()) {
+ if (context != null && !context.getDispatchersUseEncodedPaths()) {
path = UDecoder.URLDecode(path, StandardCharsets.UTF_8);
}
dispatch(path);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
