NullReferenceException when using the data visualizer on a Serilog/Cl…

…ef log file. Fix #189
Analogy-LogViewer · Jun 18, 2020 · bbe171d · bbe171d
1 parent 10cd6fa
commit bbe171d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/Analogy/Analogy.csproj b/Analogy/Analogy.csproj
@@ -15,7 +15,7 @@
     <Product>Analogy Log Viewer</Product>
     <Description>Modern Log Viewer and analyzer.</Description>
     <Copyright>Copyright @ Lior Banai 2020</Copyright>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyVersion>4.2.2.0</AssemblyVersion>
     <FileVersion>4.2.1.0</FileVersion>
     <NoWarn>1591;1573;0419;1607</NoWarn>
     <PlatformToolset>v120</PlatformToolset>
@@ -80,7 +80,7 @@
   <PropertyGroup>
     <PreBuildEvent />
     <PostBuildEvent />
-    <Version>4.2.1</Version>
+    <Version>4.2.2</Version>
     <RepositoryUrl>https://github.com/Analogy-LogViewer/Analogy.LogViewer</RepositoryUrl>
     <PackageIcon>icon.png</PackageIcon>
     <PackageIconUrl />

diff --git a/Analogy/CommonChangeLog.cs b/Analogy/CommonChangeLog.cs
@@ -11,8 +11,9 @@ public static IEnumerable<AnalogyChangeLog> GetChangeLog()
             return new List<AnalogyChangeLog>
             {
 
-             new AnalogyChangeLog("Upgrade to DevExpress 19.1.11. #187",AnalogChangeLogType.Improvement,"Lior Banai", new DateTime(2020, 06, 11)),
-             new AnalogyChangeLog("Reload file is ignore when caching is on #181",AnalogChangeLogType.Bug,"Lior Banai", new DateTime(2020, 06, 04)),
+                new AnalogyChangeLog("NullReferenceException when using the data visualizer on a Serilog/Clef log file #189",AnalogChangeLogType.Bug,"Lior Banai", new DateTime(2020, 06, 18)),
+                new AnalogyChangeLog("Upgrade to DevExpress 19.1.11. #187",AnalogChangeLogType.Improvement,"Lior Banai", new DateTime(2020, 06, 11)),
+                new AnalogyChangeLog("Reload file is ignore when caching is on #181",AnalogChangeLogType.Bug,"Lior Banai", new DateTime(2020, 06, 04)),
                 new AnalogyChangeLog("Log Analysis: Add free-text pie chart #177",AnalogChangeLogType.Improvement,"Lior Banai", new DateTime(2020, 05, 29)),
                 new AnalogyChangeLog("Store date sorting order between runs #178",AnalogChangeLogType.Improvement,"Lior Banai", new DateTime(2020, 05, 29)),
                 new AnalogyChangeLog("Allows application to minimized to the tray bar instead of closing #174",AnalogChangeLogType.Improvement,"Lior Banai", new DateTime(2020, 05, 28)),

diff --git a/Analogy/Types/LogStatistics.cs b/Analogy/Types/LogStatistics.cs
@@ -41,7 +41,7 @@ public List<Statistics> CalculateTextStatistics()
         public void ClearTexts() => Texts.Clear();
         public IEnumerable<ItemStatistics> CalculateModulesStatistics()
         {
-            foreach (var module in Modules)
+            foreach (var module in Modules.Where(m => m != null))
             {
                 yield return CalculateSingleStatistics(module);
 
@@ -51,7 +51,7 @@ public IEnumerable<ItemStatistics> CalculateModulesStatistics()
 
         public ItemStatistics CalculateSingleStatistics(string module)
         {
-            return new ItemStatistics(module, Messages.Count(m => m.Module.Equals(module)),
+            return new ItemStatistics(module, Messages.Count(m => module.Equals(m.Module)),
                 CountModuleMessages(module, AnalogyLogLevel.Error), CountModuleMessages(module, AnalogyLogLevel.Warning),
                 CountModuleMessages(module, AnalogyLogLevel.Critical), CountModuleMessages(module, AnalogyLogLevel.Event),
                 CountModuleMessages(module, AnalogyLogLevel.Debug), CountModuleMessages(module, AnalogyLogLevel.Verbose));
@@ -60,9 +60,9 @@ public ItemStatistics CalculateSingleStatistics(string module)
 
         public IEnumerable<ItemStatistics> CalculateSourcesStatistics()
         {
-            foreach (var source in Sources)
+            foreach (var source in Sources.Where(s => s != null))
             {
-                yield return new ItemStatistics(source, Messages.Count(m => m.Source.Equals(source)),
+                yield return new ItemStatistics(source, Messages.Count(m => source.Equals(m.Source)),
                     CountSourceMessages(source, AnalogyLogLevel.Error), CountSourceMessages(source, AnalogyLogLevel.Warning),
                     CountSourceMessages(source, AnalogyLogLevel.Critical), CountSourceMessages(source, AnalogyLogLevel.Event),
                     CountSourceMessages(source, AnalogyLogLevel.Debug), CountSourceMessages(source, AnalogyLogLevel.Verbose));
@@ -71,7 +71,7 @@ public IEnumerable<ItemStatistics> CalculateSourcesStatistics()
         }
 
         private int CountMessages(List<AnalogyLogMessage> messages, AnalogyLogLevel level) => messages.Count(m => m.Level == level);
-        private int CountModuleMessages(string module, AnalogyLogLevel level) => Messages.Count(m => m.Level == level && m.Module.Equals(module));
-        private int CountSourceMessages(string source, AnalogyLogLevel level) => Messages.Count(m => m.Level == level && m.Source.Equals(source));
+        private int CountModuleMessages(string module, AnalogyLogLevel level) => Messages.Count(m => m.Level == level && module.Equals(m.Module));
+        private int CountSourceMessages(string source, AnalogyLogLevel level) => Messages.Count(m => m.Level == level && source.Equals(m.Source));
     }
 }
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 <a href="https://github.com/Analogy-LogViewer/Analogy.LogViewer/releases">
     <img src="https://img.shields.io/github/v/release/Analogy-LogViewer/Analogy.LogViewer"  alt="Latest Release" />
 </a>
-<a href="https://github.com/Analogy-LogViewer/Analogy.LogViewer/compare/V4.2.1...master">
+<a href="https://github.com/Analogy-LogViewer/Analogy.LogViewer/compare/V4.2.2...master">
     <img src="https://img.shields.io/github/commits-since/Analogy-LogViewer/Analogy.LogViewer/latest"  alt="Commits Since Latest Release"/>
 </a>
 </p>