[slf4j-dev] [GIT] SLF4J: Simple Logging Facade for Java branch, master, updated. v_1.6.1-43-g8eb1912

[added by portage for gitosis-gentoo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SLF4J: Simple Logging Facade for Java".

The branch, master has been updated
       via  8eb1912cdd9e05b02ea1bb7a25f485b33a202fa6 (commit)
      from  67f86a636d4f8b01d7ab324b8206602c47907473 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=8eb1912cdd9e05b02ea1bb7a25f485b33a202fa6
http://github.com/ceki/slf4j/commit/8eb1912cdd9e05b02ea1bb7a25f485b33a202fa6

commit 8eb1912cdd9e05b02ea1bb7a25f485b33a202fa6
Author: Ceki Gulcu <ceki at qos.ch>
Date:   Mon Aug 15 19:43:36 2011 +0200

    fixing #228 for MDC

diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
index 82fc6af..fb7927c 100644
--- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
+++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
@@ -113,16 +113,13 @@ public final class LoggerFactory {
   }
 
   private static boolean messageContainsOrgSlf4jImplStaticLoggerBinder(String msg) {
-      if(msg == null)
-          return false;
-
-      if(msg.indexOf("org/slf4j/impl/StaticLoggerBinder") != -1)
-          return true;
-
-      if(msg.indexOf("org.slf4j.impl.StaticLoggerBinder") != -1)
-           return true;
-
+    if(msg == null)
       return false;
+    if(msg.indexOf("org/slf4j/impl/StaticLoggerBinder") != -1)
+      return true;
+    if(msg.indexOf("org.slf4j.impl.StaticLoggerBinder") != -1)
+      return true;
+    return false;
   }
 
   private final static void bind() {
diff --git a/slf4j-api/src/main/java/org/slf4j/MDC.java b/slf4j-api/src/main/java/org/slf4j/MDC.java
index 1670061..b94782c 100644
--- a/slf4j-api/src/main/java/org/slf4j/MDC.java
+++ b/slf4j-api/src/main/java/org/slf4j/MDC.java
@@ -74,7 +74,7 @@ public class MDC {
     } catch (NoClassDefFoundError ncde) {
       mdcAdapter = new NOPMDCAdapter();
       String msg = ncde.getMessage();
-      if (msg != null && msg.indexOf("org/slf4j/impl/StaticMDCBinder") != -1) {
+      if (msg != null && msg.indexOf("StaticMDCBinder") != -1) {
         Util.report("Failed to load class \"org.slf4j.impl.StaticMDCBinder\".");
         Util.report("Defaulting to no-operation MDCAdapter implementation.");
         Util

-----------------------------------------------------------------------

Summary of changes:
 .../src/main/java/org/slf4j/LoggerFactory.java     |   15 ++++++---------
 slf4j-api/src/main/java/org/slf4j/MDC.java         |    2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
SLF4J: Simple Logging Facade for Java