Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EDB0CCA7F for ; Mon, 23 Sep 2013 03:38:04 +0000 (UTC) Received: (qmail 12678 invoked by uid 500); 23 Sep 2013 03:38:04 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 12649 invoked by uid 500); 23 Sep 2013 03:38:02 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 12642 invoked by uid 99); 23 Sep 2013 03:38:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Sep 2013 03:38:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Sep 2013 03:37:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 21D3A23888A6; Mon, 23 Sep 2013 03:37:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1525497 - /logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java Date: Mon, 23 Sep 2013 03:37:37 -0000 To: commits@logging.apache.org From: rpopma@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130923033737.21D3A23888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rpopma Date: Mon Sep 23 03:37:36 2013 New Revision: 1525497 URL: http://svn.apache.org/r1525497 Log: bugfix: unregistering a LoggerContext MBean should also unregister associated LoggerConfig and Appender MBeans Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java?rev=1525497&r1=1525496&r2=1525497&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java Mon Sep 23 03:37:36 2013 @@ -170,8 +170,6 @@ public final class Server { * * @param loggerContextName * name of the logger context to unregister - * @throws JMException - * if a problem occurs during de-registration */ public static void unregisterContext(String loggerContextName) { final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); @@ -187,13 +185,13 @@ public final class Server { * name of the logger context to unregister * @param mbs * the MBean Server to unregister the instrumented objects from - * @throws JMException - * if a problem occurs during de-registration */ public static void unregisterContext(String contextName, MBeanServer mbs) { final String pattern = LoggerContextAdminMBean.PATTERN; final String search = String.format(pattern, contextName, "*"); unregisterAllMatching(search, mbs); + unregisterLoggerConfigs(contextName, mbs); + unregisterAppenders(contextName, mbs); } private static void registerStatusLogger(final MBeanServer mbs, final Executor executor)