Fixing some bugs for metadata not loaded

rappen · Feb 9, 2022 · fdbe834 · fdbe834
1 parent 7df1fb6
commit fdbe834
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/FetchXmlBuilder/FetchXmlBuilder.cs b/FetchXmlBuilder/FetchXmlBuilder.cs
@@ -781,7 +781,7 @@ internal void LoadViews(Action viewsLoaded)
                     foreach (var view in sysviews.Entities)
                     {
                         var entityname = view["returnedtypecode"].ToString();
-                        if (!string.IsNullOrWhiteSpace(entityname) && entities.ContainsKey(entityname))
+                        if (!string.IsNullOrWhiteSpace(entityname) && entities != null && entities.ContainsKey(entityname))
                         {
                             if (views == null)
                             {
@@ -802,7 +802,7 @@ internal void LoadViews(Action viewsLoaded)
                     foreach (var view in userviews.Entities)
                     {
                         var entityname = view["returnedtypecode"].ToString();
-                        if (!string.IsNullOrWhiteSpace(entityname) && entities.ContainsKey(entityname))
+                        if (!string.IsNullOrWhiteSpace(entityname) && entities != null && entities.ContainsKey(entityname))
                         {
                             if (views == null)
                             {
@@ -1130,11 +1130,14 @@ private List<string> GetEntitiesFromFetch(XmlNode definitionXmlNode, List<string
 
         private EntityMetadata GetEntity(int etc)
         {
-            foreach (EntityMetadata entity in entities.Values)
+            if (entities != null)
             {
-                if (entity.ObjectTypeCode == etc)
+                foreach (EntityMetadata entity in entities.Values)
                 {
-                    return entity;
+                    if (entity.ObjectTypeCode == etc)
+                    {
+                        return entity;
+                    }
                 }
             }
             return null;
@@ -1285,6 +1288,10 @@ private void LoadEntityDetailsCompleted(string entityName, EntityMetadata Result
             {
                 if (Result != null)
                 {
+                    if (entities == null)
+                    {
+                        entities = new Dictionary<string, EntityMetadata>();
+                    }
                     if (entities.ContainsKey(entityName))
                     {
                         entities[entityName] = Result;