(tomcat) branch main updated: Simplify code

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 b59187c0e1 Simplify code
b59187c0e1 is described below

commit b59187c0e17250e8783e6fba9c0268fb85791096
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jul 21 11:23:14 2026 +0100

    Simplify code
---
 java/org/apache/catalina/valves/RemoteIpValve.java | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java b/java/org/apache/catalina/valves/RemoteIpValve.java
index af678f943f..b936f8c158 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -736,22 +736,14 @@ public class RemoteIpValve extends ValveBase {
                 request.setLocalPort(originalLocalPort);
 
                 MimeHeaders headers = request.getCoyoteRequest().getMimeHeaders();
-                if (originalProxiesHeaderValues.isEmpty()) {
-                    headers.removeHeader(proxiesHeader);
-                } else {
-                    headers.removeHeader(proxiesHeader);
-                    for (String v : originalProxiesHeaderValues) {
-                        headers.addValue(proxiesHeader).setString(v);
-                    }
+                headers.removeHeader(proxiesHeader);
+                for (String v : originalProxiesHeaderValues) {
+                    headers.addValue(proxiesHeader).setString(v);
                 }
 
-                if (originalRemoteIpHeaderValues.isEmpty()) {
-                    headers.removeHeader(remoteIpHeader);
-                } else {
-                    headers.removeHeader(remoteIpHeader);
-                    for (String v : originalRemoteIpHeaderValues) {
-                        headers.addValue(remoteIpHeader).setString(v);
-                    }
+                headers.removeHeader(remoteIpHeader);
+                for (String v : originalRemoteIpHeaderValues) {
+                    headers.addValue(remoteIpHeader).setString(v);
                 }
             }
         }