[LOG4J2-1506] Unregister JMX ignores log4j2.disable.jmx property. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8b40c1f0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8b40c1f0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8b40c1f0
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 8b40c1f0e3b53277c399511923f9d7b2aa110fea Parents: 30ea283 Author: Gary Gregory <ggreg...@apache.org> Authored: Wed Aug 24 08:05:52 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Wed Aug 24 08:05:52 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/logging/log4j/core/jmx/Server.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b40c1f0/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java index 39cafeb..438f501 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java @@ -238,6 +238,10 @@ public final class Server { * @param loggerContextName name of the logger context to unregister */ public static void unregisterLoggerContext(final String loggerContextName) { + if (isJmxDisabled()) { + LOGGER.debug("JMX disabled for Log4j2. Not unregistering MBeans."); + return; + } final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); unregisterLoggerContext(loggerContextName, mbs); }
