tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1825909 - in /tomcat/trunk: java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml
Date Mon, 05 Mar 2018 15:29:22 GMT
Author: markt
Date: Mon Mar  5 15:29:22 2018
New Revision: 1825909

URL: http://svn.apache.org/viewvc?rev=1825909&view=rev
Log:
Ensure the MBean names for the SSLHostConfig and SSLHostConfigCertificate are correctly formed
when the Connector is bound to a specific IP address.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1825909&r1=1825908&r2=1825909&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon Mar  5 15:29:22
2018
@@ -1058,8 +1058,8 @@ public abstract class AbstractEndpoint<S
     private void registerJmx(SSLHostConfig sslHostConfig) {
         ObjectName sslOname = null;
         try {
-            sslOname = new ObjectName(domain + ":type=SSLHostConfig,ThreadPool=" +
-                    getName() + ",name=" + ObjectName.quote(sslHostConfig.getHostName()));
+            sslOname = new ObjectName(domain + ":type=SSLHostConfig,ThreadPool=\"" +
+                    getName() + "\",name=" + ObjectName.quote(sslHostConfig.getHostName()));
             sslHostConfig.setObjectName(sslOname);
             try {
                 Registry.getRegistry(null, null).registerComponent(sslHostConfig, sslOname,
null);
@@ -1075,8 +1075,8 @@ public abstract class AbstractEndpoint<S
             ObjectName sslCertOname = null;
             try {
                 sslCertOname = new ObjectName(domain +
-                        ":type=SSLHostConfigCertificate,ThreadPool=" + getName() +
-                        ",Host=" + ObjectName.quote(sslHostConfig.getHostName()) +
+                        ":type=SSLHostConfigCertificate,ThreadPool=\"" + getName() +
+                        "\",Host=" + ObjectName.quote(sslHostConfig.getHostName()) +
                         ",name=" + sslHostConfigCert.getType());
                 sslHostConfigCert.setObjectName(sslCertOname);
                 try {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1825909&r1=1825908&r2=1825909&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Mar  5 15:29:22 2018
@@ -45,10 +45,21 @@
   issues do not "pop up" wrt. others).
 -->
 <section name="Tomcat 9.0.7 (markt)" rtext="in development">
+  <subsection name="Catalina">
+    <changelog>
+      <fix>
+        Ensure the MBean names for the <code>SSLHostConfig</code> and
+        <code>SSLHostConfigCertificate</code> are correctly formed when the
+        <code>Connector</code> is bound to a specific IP address. (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Other">
     <changelog>
-      Update the build script so MD5 hashes are no longer generated for releases
-      as per the change in the ASF distribution policy. (markt)
+      <update>
+        Update the build script so MD5 hashes are no longer generated for
+        releases as per the change in the ASF distribution policy. (markt)
+      </update>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message