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 16d3d0baaa Simplify code
16d3d0baaa is described below
commit 16d3d0baaa22673e4bb17d2f717d5f3db4b87e42
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 f1dcf8aa6c..52a53ee9f6 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -793,22 +793,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);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
