@@ -47,11 +47,10 @@ public interface INHibernateLoggerFactory
47
47
/// By default, it will use a <see cref="Log4NetLoggerFactory"/> if log4net is available, otherwise it will
48
48
/// use a <see cref="NoLoggingNHibernateLoggerFactory"/>.
49
49
/// </remarks>
50
- public class NHibernateLogger
50
+ public static class NHibernateLogger
51
51
{
52
52
private const string nhibernateLoggerConfKey = "nhibernate-logger" ;
53
- private readonly INHibernateLoggerFactory _loggerFactory ;
54
- private static NHibernateLogger _instance ;
53
+ private static INHibernateLoggerFactory _loggerFactory ;
55
54
56
55
static NHibernateLogger ( )
57
56
{
@@ -66,7 +65,7 @@ static NHibernateLogger()
66
65
/// <param name="loggerFactory">A logger factory.</param>
67
66
public static void SetLoggersFactory ( INHibernateLoggerFactory loggerFactory )
68
67
{
69
- _instance = new NHibernateLogger ( loggerFactory ?? new NoLoggingNHibernateLoggerFactory ( ) ) ;
68
+ _loggerFactory = loggerFactory ?? new NoLoggingNHibernateLoggerFactory ( ) ;
70
69
71
70
#pragma warning disable 618
72
71
if ( ! ( loggerFactory is LoggerProvider . LegacyLoggerFactoryAdaptor ) )
@@ -76,19 +75,14 @@ public static void SetLoggersFactory(INHibernateLoggerFactory loggerFactory)
76
75
#pragma warning restore 618
77
76
}
78
77
79
- private NHibernateLogger ( INHibernateLoggerFactory loggerFactory )
80
- {
81
- _loggerFactory = loggerFactory ;
82
- }
83
-
84
78
/// <summary>
85
79
/// Get a logger for the given log key.
86
80
/// </summary>
87
81
/// <param name="keyName">The log key.</param>
88
82
/// <returns>A NHibernate logger.</returns>
89
83
public static INHibernateLogger For ( string keyName )
90
84
{
91
- return _instance . _loggerFactory . LoggerFor ( keyName ) ;
85
+ return _loggerFactory . LoggerFor ( keyName ) ;
92
86
}
93
87
94
88
/// <summary>
@@ -98,7 +92,7 @@ public static INHibernateLogger For(string keyName)
98
92
/// <returns>A NHibernate logger.</returns>
99
93
public static INHibernateLogger For ( System . Type type )
100
94
{
101
- return _instance . _loggerFactory . LoggerFor ( type ) ;
95
+ return _loggerFactory . LoggerFor ( type ) ;
102
96
}
103
97
104
98
private static string GetNhibernateLoggerClass ( )
0 commit comments