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 @@
}
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 @@
} 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