andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix unclean backport in InternalLoggerFactory

Browse Source 
.. which leaked in from d0912f2709
This commit is contained in:
Trustin Lee 2014-07-02 20:27:06 +09:00
parent d0912f2709
commit 3c6bc0b4cb
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/io/netty/util/internal/logging/InternalLoggerFactory.java
View File

@ -31,15 +31,8 @@ package io.netty.util.internal.logging;
* as possible and shouldn't be called more than once.
*/
public abstract class InternalLoggerFactory {
private static volatile InternalLoggerFactory defaultFactory;
static {
final String name = InternalLoggerFactory.class.getName();
InternalLoggerFactory f;
f = newDefaultFactory(name);
defaultFactory = f;
}
private static volatile InternalLoggerFactory defaultFactory =
newDefaultFactory(InternalLoggerFactory.class.getName());
@SuppressWarnings("UnusedCatchParameter")
private static InternalLoggerFactory newDefaultFactory(String name) {
@ -47,7 +40,6 @@ public abstract class InternalLoggerFactory {
try {
f = new Slf4JLoggerFactory(true);
f.newInstance(name).debug("Using SLF4J as the default logging framework");
defaultFactory = f;
} catch (Throwable t1) {
try {
f = new Log4JLoggerFactory();