[GIT] SLF4J: Simple Logging Facade for Java branch, master, updated. v1.5.11-9-ga19566c

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 a19566c1e0752a651057279e80384ef5ac37dfae (commit) from 581b20f8aaa140ce722669a2cf1d8582a963ff4e (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=a19566c1e0752a651057279e803... http://github.com/ceki/slf4j/commit/a19566c1e0752a651057279e80384ef5ac37dfae commit a19566c1e0752a651057279e80384ef5ac37dfae Author: Ceki Gulcu <ceki@qos.ch> Date: Mon Apr 5 19:03:04 2010 +0200 - the SINGLETON field in StaticLoggerBinder is now private diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java index 96858a9..8df4398 100644 --- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java @@ -218,7 +218,7 @@ public final class LoggerFactory { private final static StaticLoggerBinder getSingleton() { if (GET_SINGLETON_METHOD == GET_SINGLETON_INEXISTENT) { - return StaticLoggerBinder.SINGLETON; + return StaticLoggerBinder.getSingleton(); } if (GET_SINGLETON_METHOD == GET_SINGLETON_EXISTS) { @@ -231,7 +231,7 @@ public final class LoggerFactory { return singleton; } catch (NoSuchMethodError nsme) { GET_SINGLETON_METHOD = GET_SINGLETON_INEXISTENT; - return StaticLoggerBinder.SINGLETON; + return StaticLoggerBinder.getSingleton(); } } diff --git a/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 672058e..5f1c2b7 100644 --- a/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -40,12 +40,8 @@ public class StaticLoggerBinder { /** * The unique instance of this class. - * - * @deprecated Please use the {@link #getSingleton()} method instead of - * accessing this field directly. In future versions, this field - * will become private. */ - public static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder(); + private static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder(); /** * Return the singleton of this class. ----------------------------------------------------------------------- Summary of changes: .../src/main/java/org/slf4j/LoggerFactory.java | 4 ++-- .../java/org/slf4j/impl/StaticLoggerBinder.java | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) hooks/post-receive -- SLF4J: Simple Logging Facade for Java
participants (1)
-
git-noreply@pixie.qos.ch