From 062f48ef5a0af0571a8ea0b4d836d1a88f6f44c2 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.schleger@gmx.de>
Date: Tue, 9 Aug 2016 19:20:34 +0200
Subject: [PATCH] JMX Server unregistering won't ignore log4j2.disable.jmx
 property

---
 .../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 cafbb41..69e8b43 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
@@ -192,6 +192,10 @@ public final class Server {
      * Unregister all log4j MBeans from the platform MBean server.
      */
     public static void unregisterMBeans() {
+        if (isJmxDisabled()) {
+            LOGGER.debug("JMX disabled for log4j2. Not unregistering MBeans.");
+            return;
+        }
         final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
         unregisterMBeans(mbs);
     }
-- 
1.9.1