This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new a1ebf9f55b Simplify code
a1ebf9f55b is described below
commit a1ebf9f55b6bf3e804b48f45d74b9b242a8afaeb
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 5e5f98b3be..ebf06838c3 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -745,22 +745,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]
