diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2013-02-23 21:19:05 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2013-02-23 21:19:05 -0800 |
| commit | e555d8a7660c90fe07f521bcaf9d6ea06453ae13 (patch) | |
| tree | 9cd539db662aebdf45cb3418072ac5c2da84d1fc /src/DotNetOpenAuth.Core/Loggers/Log4NetLogger.cs | |
| parent | 64af1dc750de84634b5e002b1f520804e895e3af (diff) | |
| parent | 778328ec797299ed6aa01279b3ccbf1eb15258bd (diff) | |
| download | DotNetOpenAuth-e555d8a7660c90fe07f521bcaf9d6ea06453ae13.zip DotNetOpenAuth-e555d8a7660c90fe07f521bcaf9d6ea06453ae13.tar.gz DotNetOpenAuth-e555d8a7660c90fe07f521bcaf9d6ea06453ae13.tar.bz2 | |
Merge remote-tracking branch 'origin/v4.1' into v4.2v4.2.2.13055
Conflicts:
src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
Diffstat (limited to 'src/DotNetOpenAuth.Core/Loggers/Log4NetLogger.cs')
| -rw-r--r-- | src/DotNetOpenAuth.Core/Loggers/Log4NetLogger.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/DotNetOpenAuth.Core/Loggers/Log4NetLogger.cs b/src/DotNetOpenAuth.Core/Loggers/Log4NetLogger.cs index 293a6b2..01da034 100644 --- a/src/DotNetOpenAuth.Core/Loggers/Log4NetLogger.cs +++ b/src/DotNetOpenAuth.Core/Loggers/Log4NetLogger.cs @@ -201,6 +201,8 @@ namespace DotNetOpenAuth.Loggers { return IsLog4NetPresent ? CreateLogger(name) : null; } catch (FileLoadException) { // wrong log4net.dll version return null; + } catch (TargetInvocationException) { // Thrown due to some security issues on .NET 4.5. + return null; } catch (TypeLoadException) { // Thrown by mono (http://stackoverflow.com/questions/10805773/error-when-pushing-dotnetopenauth-to-staging-or-production-environment) return null; } |