Fix #108 - Parent nodes can be null when items are put in the trash.

fixes the find methods, which are called to get a parent item, but when you trash a item - its parent is set to null 😦
KevinJump · May 23, 2020 · eecb6c3 · eecb6c3
1 parent 4d2b9e3
commit eecb6c3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/uSync8.ContentEdition/Serializers/ContentSerializer.cs b/uSync8.ContentEdition/Serializers/ContentSerializer.cs
@@ -325,9 +325,13 @@ protected override IContent CreateItem(string alias, ITreeEntity parent, string
         protected override IContent FindItem(int id)
         {
             var item = contentService.GetById(id);
-            if (!this.nameCache.ContainsKey(id))
-                this.nameCache[id] = new Tuple<Guid, string>(item.Key, item.Name);
-            return item;
+            if (item != null)
+            {
+                if (!this.nameCache.ContainsKey(id))
+                    this.nameCache[id] = new Tuple<Guid, string>(item.Key, item.Name);
+                return item;
+            }
+            return null;
         }
 
         protected override IContent FindItem(Guid key)

diff --git a/uSync8.ContentEdition/Serializers/MediaSerializer.cs b/uSync8.ContentEdition/Serializers/MediaSerializer.cs
@@ -3,6 +3,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
 using System.Security.Cryptography;
 using System.Xml.Linq;
 
@@ -182,9 +183,13 @@ protected override IMedia CreateItem(string alias, ITreeEntity parent, string it
         protected override IMedia FindItem(int id)
         {
             var item = mediaService.GetById(id);
-            if (!this.nameCache.ContainsKey(id))
-                this.nameCache[id] = new Tuple<Guid, string>(item.Key, item.Name);
-            return item;
+            if (item != null)
+            {
+                if (!this.nameCache.ContainsKey(id))
+                    this.nameCache[id] = new Tuple<Guid, string>(item.Key, item.Name);
+                return item;
+            }
+            return null;
         }