This is an automated email from the ASF dual-hosted git repository.
remm 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 3f7f3e3cb9 Fix merge
3f7f3e3cb9 is described below
commit 3f7f3e3cb9daa7916664f6d17e98bede6753899a
Author: remm <[email protected]>
AuthorDate: Thu Sep 25 16:02:55 2025 +0200
Fix merge
---
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 2723527a35..89d14d2a60 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -539,7 +539,6 @@ public abstract class AbstractEndpoint<S, U> {
}
// Merge server groups with the client groups
if (JreCompat.isJre20Available()) {
- // Merge server groups with the client groups
List<String> supportedGroups = new ArrayList<>();
LinkedHashSet<Group> serverSupportedGroups =
sslHostConfig.getGroupList();
if (serverSupportedGroups != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
