This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 32e316f4725f46ad98475dff983ba313112467a2 Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri May 3 09:23:22 2024 +0100 Align with 10.1.x --- java/org/apache/catalina/ant/AbstractCatalinaTask.java | 2 +- java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java | 5 +---- java/org/apache/catalina/core/ApplicationRequest.java | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java b/java/org/apache/catalina/ant/AbstractCatalinaTask.java index 02a0d2bdc2..810929a4d9 100644 --- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java +++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java @@ -289,7 +289,7 @@ public abstract class AbstractCatalinaTask extends BaseRedirectorHelperTask { * Authenticator.setDefault() for authentication as the JRE then provides the DIGEST client implementation. However, * the above two are not compatible. When the request is made, the resulting 401 triggers an exception because, when * using streams, the InputStream is no longer available to send with the repeated request that now includes the - * appropriate Authorization header. The hack is to make a simple OPTIONS request- i.e. without a request body.This + * appropriate Authorization header. The hack is to make a simple OPTIONS request- i.e. without a request body. This * triggers authentication and the requirement to authenticate for this host is cached and used to provide an * appropriate Authorization when the next request is made (that includes a request body). */ diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java index 8358e9f924..0098f6acb7 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java @@ -155,10 +155,7 @@ public class JMXAccessorQueryTask extends JMXAccessorTask { } continue; } - if (value == null) { - continue; - } - if ("modelerType".equals(attName)) { + if (value == null || "modelerType".equals(attName)) { continue; } createProperty(pname + attName, value); diff --git a/java/org/apache/catalina/core/ApplicationRequest.java b/java/org/apache/catalina/core/ApplicationRequest.java index add391aa67..80d9a8b19c 100644 --- a/java/org/apache/catalina/core/ApplicationRequest.java +++ b/java/org/apache/catalina/core/ApplicationRequest.java @@ -136,6 +136,7 @@ class ApplicationRequest extends ServletRequestWrapper { return specialsSet.contains(name); } + // ------------------------------------------ ServletRequestWrapper Methods /** --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org