From 69a6f143356a864a776da2f2a79e299e7ceff13b Mon Sep 17 00:00:00 2001
From: Johannes <johannes.schleger@gmx.de>
Date: Wed, 24 Aug 2016 08:15:24 +0200
Subject: [PATCH] JMX Server unregistering won't ignore log4j2.disable.jmx

---
 .../src/main/java/org/apache/logging/log4j/core/jmx/Server.java       | 4 ++++
 1 file changed, 4 insertions(+)

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);
     }
-- 
1.9.1