You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/07/27 13:07:12 UTC
[tomcat] branch 9.0.x updated: No longer automatically disable JMX
when using GraalVM native images
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 f11dc24 No longer automatically disable JMX when using GraalVM native images
f11dc24 is described below
commit f11dc242ac4f7f6536d10efb876483652304e910
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 27 14:06:28 2021 +0100
No longer automatically disable JMX when using GraalVM native images
---
java/org/apache/tomcat/util/modeler/Registry.java | 7 +------
webapps/docs/changelog.xml | 6 ++++++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java b/java/org/apache/tomcat/util/modeler/Registry.java
index e98a598..a15fb0d 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -39,7 +39,6 @@ import javax.management.ObjectName;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.compat.JreCompat;
import org.apache.tomcat.util.modeler.modules.ModelerSource;
import org.apache.tomcat.util.res.StringManager;
@@ -136,11 +135,7 @@ public class Registry implements RegistryMBean, MBeanRegistration {
*/
public static synchronized Registry getRegistry(Object key, Object guard) {
if (registry == null) {
- if (JreCompat.isGraalAvailable()) {
- disableRegistry();
- } else {
- registry = new Registry();
- }
+ registry = new Registry();
registry.guard = guard;
}
if (registry.guard != null && registry.guard != guard) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 217bf47..e8c0b21 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -190,6 +190,12 @@
<add>
Improvements to Korean translations. (woonsan)
</add>
+ <fix>
+ Use of GraalVM native images no longer automatically disables JMX
+ support. JMX support may still be disabled by calling
+ <code>org.apache.tomcat.util.modeler.Registry.disableRegistry()</code>.
+ (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org