This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new e1ed35a69d Fix BZ 66822. Use same name format for Connector and
ProtocolHandler
e1ed35a69d is described below
commit e1ed35a69dc91e6fc431dc3931ab746eadfdec56
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Aug 3 14:40:03 2023 +0100
Fix BZ 66822. Use same name format for Connector and ProtocolHandler
https://bz.apache.org/bugzilla/show_bug.cgi?id=66822
---
java/org/apache/catalina/connector/Connector.java | 27 ++++++++++++++---------
webapps/docs/changelog.xml | 4 ++++
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index 64440c5020..fb77d9fb31 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -1095,19 +1095,24 @@ public class Connector extends LifecycleMBeanBase {
public String toString() {
// Not worth caching this right now
StringBuilder sb = new StringBuilder("Connector[");
- sb.append(getProtocol());
- sb.append('-');
- String id = (protocolHandler != null) ? protocolHandler.getId() : null;
- if (id != null) {
- sb.append(id);
- } else {
- int port = getPortWithOffset();
- if (port > 0) {
- sb.append(port);
+ String name = (String) getProperty("name");
+ if (name == null) {
+ sb.append(getProtocol());
+ sb.append('-');
+ String id = (protocolHandler != null) ? protocolHandler.getId() :
null;
+ if (id != null) {
+ sb.append(id);
} else {
- sb.append("auto-");
- sb.append(getProperty("nameIndex"));
+ int port = getPortWithOffset();
+ if (port > 0) {
+ sb.append(port);
+ } else {
+ sb.append("auto-");
+ sb.append(getProperty("nameIndex"));
+ }
}
+ } else {
+ sb.append(name);
}
sb.append(']');
return sb.toString();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5aaab8f3d5..997a2f4434 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -128,6 +128,10 @@
Catch <code>NamingException</code> in
<code>JNDIRealm#getPrincipal</code>.
It is used in Java up to 17 to signal closed connections. (fschumacher)
</fix>
+ <fix>
+ <bug>66822</bug>: Use the same naming format in log messages for
+ Connector instances as the associated ProtocolHandler instance. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
