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 80415d66bf Simplify
80415d66bf is described below
commit 80415d66bff616a708f95723a0210ca0a3669389
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 e60ba186c0..fa4f727c02 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]
