From ed0a73c3f9eeecd7b52e5aa6aa2c5f447e783611 Mon Sep 17 00:00:00 2001
From: Johannes Schleger <johannes.schleger@gmx.de>
Date: Tue, 27 Sep 2016 14:26:22 +0200
Subject: [PATCH] JMX Server unregistering won't ignore log4j2.disable.jmx

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

diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
index 1f99941..104a921 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
@@ -315,8 +315,8 @@ public class LoggerContext extends AbstractLifeCycle
             this.setStopping();
             try {
                 Server.unregisterLoggerContext(getName()); // LOG4J2-406, LOG4J2-500
-            } catch (final Exception ex) {
-                LOGGER.error("Unable to unregister MBeans", ex);
+            } catch (final Throwable t) {
+                LOGGER.error("Unable to unregister MBeans", t);
             }
             if (shutdownCallback != null) {
                 shutdownCallback.cancel();
-- 
1.9.1