Optimizations and corrections for Json output

spaghettidba · Feb 23, 2023 · 9c771ae · 9c771ae
1 parent 0ac72d5
commit 9c771ae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/XESmartTarget.Core/Responses/OutputStreamAppenderResponse.cs b/XESmartTarget.Core/Responses/OutputStreamAppenderResponse.cs
@@ -153,6 +153,10 @@ protected void Write()
         {
             lock (EventsTable)
             {
+                if (EventsTable.Rows.Count == 0)
+                {
+                    return;
+                }
                 lock (Lock)
                 {
                     if (_outputFormat == OutputFormatEnum.Json)

diff --git a/XESmartTarget.Core/Utils/DataTableJsonAdapter.cs b/XESmartTarget.Core/Utils/DataTableJsonAdapter.cs
@@ -37,12 +37,17 @@ public DataTableJsonAdapter(DataTable eventsTable)
 
         public void WriteToStream(TextWriter writer)
         {
+            if(Table.Rows.Count == 0)
+            {
+                return;
+            }
+
             var converter = new ExpandoObjectConverter();
             var minifier = new JsMinifier();
 
             if (OutputColumns != null)
             {
-                Table = Table.DefaultView.ToTable(false, OutputColumns);
+                Table = Table.DefaultView.ToTable(false, OutputColumns.Where(c => Table.Columns.Contains(c)).ToArray());
             }
 
             List<Object> outputList = null;