From ddc0b2907ff7cf6f3bb902f2475f55d0e6d6ce0b Mon Sep 17 00:00:00 2001
From: whut <rafalklys@wp.pl>
Date: Tue, 2 Aug 2011 00:25:34 +0200
Subject: [PATCH] Addded fix for log4net not always finding, reported in
 https://nhibernate.jira.com/browse/NH-2821

---
 src/NHibernate/Logging.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/NHibernate/Logging.cs b/src/NHibernate/Logging.cs
index e6f3dc1717b..3b0adcf798d 100644
--- a/src/NHibernate/Logging.cs
+++ b/src/NHibernate/Logging.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
 
 namespace NHibernate
 {
@@ -81,16 +82,13 @@ private static string GetNhibernateLoggerClass()
 			string nhibernateLoggerClass = null;
 			if (string.IsNullOrEmpty(nhibernateLogger))
 			{
-				// look for log4net.dll
-				string baseDir = AppDomain.CurrentDomain.BaseDirectory;
-				string relativeSearchPath = AppDomain.CurrentDomain.RelativeSearchPath;
-				string binPath = relativeSearchPath == null ? baseDir : Path.Combine(baseDir, relativeSearchPath);
-				var log4NetDllPath = Path.Combine(binPath, "log4net.dll");
-
-				if (File.Exists(log4NetDllPath))
+				try
 				{
-					nhibernateLoggerClass = typeof (Log4NetLoggerFactory).AssemblyQualifiedName;
+					// look for log4net.dll
+					Assembly.Load("log4net");
+					nhibernateLoggerClass = typeof(Log4NetLoggerFactory).AssemblyQualifiedName;
 				}
+				catch { }
 			}
 			else
 			{