[tomcat] branch 8.5.x updated: Remove unnecessary code

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 224945058f Remove unnecessary code
224945058f is described below

commit 224945058f5bd3edd41f7640c4dc2341c8b7c218
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Oct 24 21:42:44 2023 +0100

    Remove unnecessary code
---
 java/org/apache/catalina/filters/CorsFilter.java        | 2 +-
 java/org/apache/catalina/manager/StatusTransformer.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/filters/CorsFilter.java 
b/java/org/apache/catalina/filters/CorsFilter.java
index 5e2414b446..ada5e9909a 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -326,7 +326,7 @@ public class CorsFilter implements Filter {
         if (!isAnyOriginAllowed()) {
             // If only specific origins are allowed, the response will vary by
             // origin
-            ResponseUtil.addVaryFieldName(response, 
CorsFilter.REQUEST_HEADER_ORIGIN);
+            ResponseUtil.addVaryFieldName(response, REQUEST_HEADER_ORIGIN);
         }
 
         // Let request pass.
diff --git a/java/org/apache/catalina/manager/StatusTransformer.java 
b/java/org/apache/catalina/manager/StatusTransformer.java
index 8c7805fbc8..5c1b6b4a3c 100644
--- a/java/org/apache/catalina/manager/StatusTransformer.java
+++ b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -348,8 +348,8 @@ public class StatusTransformer {
             }
             String name = objectName.getKeyProperty("name");
             // use StatusTransformer to output status
-            StatusTransformer.writeConnectorState(writer, objectName, name, 
mBeanServer, globalRequestProcessors,
-                    requestProcessors, mode, args);
+            writeConnectorState(
+                    writer, objectName, name, mBeanServer, 
globalRequestProcessors, requestProcessors, mode, args);
         }
         if (mode == 2) {
             writer.append(']').println();


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org