tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r1846753 - in /tomcat/trunk: java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml
Date Fri, 16 Nov 2018 19:46:03 GMT
Author: remm
Date: Fri Nov 16 19:46:03 2018
New Revision: 1846753

URL: http://svn.apache.org/viewvc?rev=1846753&view=rev
Log:
Avoid SSLHostConfig JMX registrations before server init

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=1846753&r1=1846752&r2=1846753&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Fri Nov 16 19:46:03
2018
@@ -1116,6 +1116,10 @@ public abstract class AbstractEndpoint<S
 
 
     private void registerJmx(SSLHostConfig sslHostConfig) {
+        if (domain == null) {
+            // Before init the domain is null
+            return;
+        }
         ObjectName sslOname = null;
         try {
             sslOname = new ObjectName(domain + ":type=SSLHostConfig,ThreadPool=\"" +

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1846753&r1=1846752&r2=1846753&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 16 19:46:03 2018
@@ -120,6 +120,9 @@
         Servlet non-blocking I/O is used to read a request body over an HTTP/2
         stream. (markt)
       </fix>
+      <fix>
+        Avoid bad SSLHostConfig JMX registrations before init. (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">



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


Mime
View raw message