TypeNamePatternConverter: added a safety net of null checks to avoid null 
reference exceptions [LOG4NET-559]


Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/2781b83b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/2781b83b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/2781b83b

Branch: refs/heads/master
Commit: 2781b83bd1ef3a15dd7b0f17934fdbf22a691a35
Parents: 29be936
Author: Dominik Psenner <dpsen...@apache.org>
Authored: Wed Mar 15 07:35:52 2017 +0000
Committer: Dominik Psenner <dpsen...@apache.org>
Committed: Wed Mar 15 07:35:52 2017 +0000

----------------------------------------------------------------------
 src/Layout/Pattern/TypeNamePatternConverter.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/2781b83b/src/Layout/Pattern/TypeNamePatternConverter.cs
----------------------------------------------------------------------
diff --git a/src/Layout/Pattern/TypeNamePatternConverter.cs 
b/src/Layout/Pattern/TypeNamePatternConverter.cs
index 0be4463..8aea75b 100644
--- a/src/Layout/Pattern/TypeNamePatternConverter.cs
+++ b/src/Layout/Pattern/TypeNamePatternConverter.cs
@@ -48,6 +48,16 @@ namespace log4net.Layout.Pattern
                /// </remarks>
                override protected string GetFullyQualifiedName(LoggingEvent 
loggingEvent) 
                {
+                       if (loggingEvent == null)
+                       {
+                               return string.Empty;
+                       }
+                       
+                       if (logigngEvent.LocationInformation == null)
+                       {
+                               return string.Empty;
+                       }
+                       
                        return loggingEvent.LocationInformation.ClassName;
                }
        }

Reply via email to