Merge branch 'whut-NH-2821'

hazzik · hazzik · commit 8692a5932d65 · 2015-02-22T14:01:56.000+13:00
diff --git a/src/NHibernate/Logging.cs b/src/NHibernate/Logging.cs
@@ -87,7 +87,7 @@ private static string GetNhibernateLoggerClass()
 				string binPath = relativeSearchPath == null ? baseDir : Path.Combine(baseDir, relativeSearchPath);
 				string log4NetDllPath = binPath == null ? "log4net.dll" : Path.Combine(binPath, "log4net.dll");
 
-				if (File.Exists(log4NetDllPath))
+				if (File.Exists(log4NetDllPath) || AppDomain.CurrentDomain.GetAssemblies().Any(a => a.GetName().Name == "log4net"))
 				{
 					nhibernateLoggerClass = typeof (Log4NetLoggerFactory).AssemblyQualifiedName;
 				}

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ private static string GetNhibernateLoggerClass()`
`87`	`87`	`string binPath = relativeSearchPath == null ? baseDir : Path.Combine(baseDir, relativeSearchPath);`
`88`	`88`	`string log4NetDllPath = binPath == null ? "log4net.dll" : Path.Combine(binPath, "log4net.dll");`
`89`	`89`
`90`		`- if (File.Exists(log4NetDllPath))`
	`90`	`+ if (File.Exists(log4NetDllPath) \|\| AppDomain.CurrentDomain.GetAssemblies().Any(a => a.GetName().Name == "log4net"))`
`91`	`91`	`{`
`92`	`92`	`nhibernateLoggerClass = typeof (Log4NetLoggerFactory).AssemblyQualifiedName;`
`93`	`93`	`}`