Merge pull request #1509 from ngbrown/bug/web-project-logging

fredericDelaporte · web-flow · commit 0c2d402e0197 · 2017-12-30T08:29:01.000+01:00
Add missing NHibernateLogLevel.Info in example web project.
Initialize args array in NHibernateLogValues.
diff --git a/src/NHibernate.Example.Web/Infrastructure/NHibernateToMicrosoftLogger.cs b/src/NHibernate.Example.Web/Infrastructure/NHibernateToMicrosoftLogger.cs
@@ -18,6 +18,7 @@ public NHibernateToMicrosoftLogger(ILogger msLogger)
 		{
 			{ NHibernateLogLevel.Trace, LogLevel.Trace },
 			{ NHibernateLogLevel.Debug, LogLevel.Debug },
+			{ NHibernateLogLevel.Info, LogLevel.Information },
 			{ NHibernateLogLevel.Warn, LogLevel.Warning },
 			{ NHibernateLogLevel.Error, LogLevel.Error },
 			{ NHibernateLogLevel.Fatal, LogLevel.Critical },
diff --git a/src/NHibernate/Logging.cs b/src/NHibernate/Logging.cs
@@ -212,7 +212,7 @@ public struct NHibernateLogValues
 		public NHibernateLogValues(string format, object[] args)
 		{
 			_format = format ?? "[Null]";
-			_args = args;
+			_args = args ?? Array.Empty<object>();
 		}
 
 		/// <summary>

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ public NHibernateToMicrosoftLogger(ILogger msLogger)`
`18`	`18`	`{`
`19`	`19`	`{ NHibernateLogLevel.Trace, LogLevel.Trace },`
`20`	`20`	`{ NHibernateLogLevel.Debug, LogLevel.Debug },`
	`21`	`+ { NHibernateLogLevel.Info, LogLevel.Information },`
`21`	`22`	`{ NHibernateLogLevel.Warn, LogLevel.Warning },`
`22`	`23`	`{ NHibernateLogLevel.Error, LogLevel.Error },`
`23`	`24`	`{ NHibernateLogLevel.Fatal, LogLevel.Critical },`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ public struct NHibernateLogValues`
`212`	`212`	`public NHibernateLogValues(string format, object[] args)`
`213`	`213`	`{`
`214`	`214`	`_format = format ?? "[Null]";`
`215`		`- _args = args;`
	`215`	`+ _args = args ?? Array.Empty<object>();`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`/// <summary>`