Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E1BEBE344 for ; Mon, 18 Mar 2013 19:13:37 +0000 (UTC) Received: (qmail 79809 invoked by uid 500); 18 Mar 2013 19:13:37 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 79722 invoked by uid 500); 18 Mar 2013 19:13:37 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 79651 invoked by uid 99); 18 Mar 2013 19:13:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Mar 2013 19:13:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E8CE9390D9; Mon, 18 Mar 2013 19:13:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jvanzyl@apache.org To: commits@maven.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Fix call to SimpleLoggerFactory.reset method (use LoggerFactory to make sure we get the right instance to reset, as SimpleLoggerFactory.INSTANCE is not actually used by slf4j-simple's StaticLoggerBinder) and remove temporary reflection workar Message-Id: <20130318191336.E8CE9390D9@tyr.zones.apache.org> Date: Mon, 18 Mar 2013 19:13:36 +0000 (UTC) Updated Branches: refs/heads/master 2ec0a6b69 -> 8b97b0a2d Fix call to SimpleLoggerFactory.reset method (use LoggerFactory to make sure we get the right instance to reset, as SimpleLoggerFactory.INSTANCE is not actually used by slf4j-simple's StaticLoggerBinder) and remove temporary reflection workaround Signed-off-by: Jason van Zyl Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8b97b0a2 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8b97b0a2 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8b97b0a2 Branch: refs/heads/master Commit: 8b97b0a2dae4ab8b8b5cc614ca58b329af2ce6ff Parents: 2ec0a6b Author: Stuart McCulloch Authored: Mon Mar 18 18:57:04 2013 +0000 Committer: Jason van Zyl Committed: Mon Mar 18 12:12:22 2013 -0700 ---------------------------------------------------------------------- .../cli/logging/impl/Slf4jSimpleConfiguration.java | 15 --------------- .../org/slf4j/impl/MavenSlf4jSimpleFriend.java | 9 ++++++++- 2 files changed, 8 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/8b97b0a2/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java index 402d562..6a7f385 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java @@ -58,20 +58,5 @@ public class Slf4jSimpleConfiguration // property for root logger level or System.out redirection need to be taken into account MavenSlf4jFriend.reset(); MavenSlf4jSimpleFriend.init(); - - try - { - org.slf4j.ILoggerFactory loggerFactory = org.slf4j.LoggerFactory.getILoggerFactory(); - synchronized ( loggerFactory ) - { - java.lang.reflect.Field loggerMap = loggerFactory.getClass().getDeclaredField( "loggerMap" ); - loggerMap.setAccessible( true ); - ( (java.util.Map) loggerMap.get( loggerFactory ) ).clear(); - } - } - catch ( Exception e ) - { - // ignore for now... - } } } http://git-wip-us.apache.org/repos/asf/maven/blob/8b97b0a2/maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java b/maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java index 3299fc8..bffd18c 100644 --- a/maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java +++ b/maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java @@ -19,6 +19,9 @@ package org.slf4j.impl; * under the License. */ +import org.slf4j.ILoggerFactory; +import org.slf4j.LoggerFactory; + /** * Utility for Maven to access Slf4j-Simple internals through package access. * Use with precaution, since this is not normally intended for production use. @@ -28,6 +31,10 @@ public class MavenSlf4jSimpleFriend public static void init() { SimpleLogger.init(); - SimpleLoggerFactory.INSTANCE.reset(); + ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory(); + if ( loggerFactory instanceof SimpleLoggerFactory ) + { + ( (SimpleLoggerFactory) loggerFactory ).reset(); + } } }