[tomcat] branch 8.5.x updated: Avoid JMX stacktraces when ruinning the testsuite

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 3f78050  Avoid JMX stacktraces when ruinning the testsuite
3f78050 is described below

commit 3f78050742684c508d2fbb8d1efed05a4f596f31
Author: remm <r...@apache.org>
AuthorDate: Wed Dec 23 11:18:47 2020 +0100

    Avoid JMX stacktraces when ruinning the testsuite
---
 java/org/apache/coyote/http2/Http2Protocol.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Http2Protocol.java 
b/java/org/apache/coyote/http2/Http2Protocol.java
index b8d3b0a..1606614 100644
--- a/java/org/apache/coyote/http2/Http2Protocol.java
+++ b/java/org/apache/coyote/http2/Http2Protocol.java
@@ -443,7 +443,10 @@ public class Http2Protocol implements UpgradeProtocol {
 
         try {
             ObjectName oname = 
this.http11Protocol.getONameForUpgrade(getUpgradeProtocolName());
-            Registry.getRegistry(null, null).registerComponent(global, oname, 
null);
+            // This can be null when running the testsuite
+            if (oname != null) {
+                Registry.getRegistry(null, null).registerComponent(global, 
oname, null);
+            }
         } catch (Exception e) {
             log.warn(sm.getString("http2Protocol.jmxRegistration.fail"), e);
         }


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