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 1138336115 Simplify
1138336115 is described below
commit 11383361159714e992e1dd1c76d02f724104a7a0
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Jul 27 08:27:20 2026 +0100
Simplify
---
java/org/apache/catalina/core/StandardContext.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 4a95ed9160..8d0471421f 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4733,10 +4733,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
private void mergeParameters() {
Map<String,String> mergedParams = new HashMap<>();
- String[] names = findParameters();
- for (String s : names) {
- mergedParams.put(s, findParameter(s));
- }
+ mergedParams.putAll(parameters);
ApplicationParameter[] params = findApplicationParameters();
for (ApplicationParameter param : params) {
@@ -4751,7 +4748,6 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
for (Map.Entry<String,String> entry : mergedParams.entrySet()) {
sc.setInitParameter(entry.getKey(), entry.getValue());
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
