Fixes cache providers to ensure it stores and resolves clones

Shazwazza · Shazwazza · commit ac7cb8febeef · 2014-04-16T14:01:26.000+10:00
diff --git a/src/Umbraco.Core/Persistence/Caching/InMemoryCacheProvider.cs b/src/Umbraco.Core/Persistence/Caching/InMemoryCacheProvider.cs
@@ -37,7 +37,10 @@ public IEntity GetById(Type type, Guid id)
             var containsKey = _cache.ContainsKey(compositeKey);
             if (containsKey)
             {
-                return _cache[compositeKey];
+                var result = _cache[compositeKey];
+
+                //IMPORTANT: we must clone to resolve, see: http://issues.umbraco.org/issue/U4-4259
+                return (IEntity)result.DeepClone();
             }
 
             return null;
@@ -56,7 +59,12 @@ select GetCompositeId(type, id)
                             into key
                             let containsKey = _cache.ContainsKey(key)
                             where containsKey
-                            select _cache[key]).ToList();
+                            select _cache[key]
+                            into result 
+                            //don't return null objects
+                            where result != null
+                            //IMPORTANT: we must clone to resolve, see: http://issues.umbraco.org/issue/U4-4259
+                            select (IEntity)result.DeepClone()).ToList();
             return list;
         }
 
@@ -67,7 +75,14 @@ where containsKey
         /// <returns></returns>
         public IEnumerable<IEntity> GetAllByType(Type type)
         {
-            var list = _cache.Keys.Where(key => key.Contains(type.Name)).Select(key => _cache[key]).ToList();
+            var list = _cache.Keys
+                .Where(key => key.Contains(type.Name))
+                .Select(key => _cache[key])
+                //don't return null objects
+                .Where(result => result != null)
+                //IMPORTANT: we must clone to resolve, see: http://issues.umbraco.org/issue/U4-4259
+                .Select(result => (IEntity)result.DeepClone())
+                .ToList();
             return list;
         }
 
@@ -78,6 +93,9 @@ public IEnumerable<IEntity> GetAllByType(Type type)
         /// <param name="entity"></param>
         public void Save(Type type, IEntity entity)
         {
+            //IMPORTANT: we must clone to store, see: http://issues.umbraco.org/issue/U4-4259
+            entity = (IEntity)entity.DeepClone();
+
             _cache.AddOrUpdate(GetCompositeId(type, entity.Id), entity, (x, y) => entity);
         }
 
diff --git a/src/Umbraco.Core/Persistence/Caching/RuntimeCacheProvider.cs b/src/Umbraco.Core/Persistence/Caching/RuntimeCacheProvider.cs
@@ -67,8 +67,11 @@ public IEntity GetById(Type type, Guid id)
             {
                 //ensure the key doesn't exist anymore in the tracker
                 _keyTracker.Remove(key);
+                return null;
             }
-            return result;
+
+            //IMPORTANT: we must clone to resolve, see: http://issues.umbraco.org/issue/U4-4259
+            return (IEntity)result.DeepClone();
         }
 
         public IEnumerable<IEntity> GetByIds(Type type, List<Guid> ids)
@@ -88,7 +91,8 @@ public IEnumerable<IEntity> GetByIds(Type type, List<Guid> ids)
                 }
                 else
                 {
-                    collection.Add(result);
+                    //IMPORTANT: we must clone to resolve, see: http://issues.umbraco.org/issue/U4-4259
+                    collection.Add((IEntity)result.DeepClone());
                 }
             }
             return collection;
@@ -113,7 +117,8 @@ public IEnumerable<IEntity> GetAllByType(Type type)
                     }
                     else
                     {
-                        collection.Add(result);
+                        //IMPORTANT: we must clone to resolve, see: http://issues.umbraco.org/issue/U4-4259
+                        collection.Add((IEntity)result.DeepClone());
                     }
                 }
             }
@@ -122,6 +127,9 @@ public IEnumerable<IEntity> GetAllByType(Type type)
 
         public void Save(Type type, IEntity entity)
         {
+            //IMPORTANT: we must clone to store, see: http://issues.umbraco.org/issue/U4-4259
+            entity = (IEntity)entity.DeepClone();
+
             var key = GetCompositeId(type, entity.Id);
             
             _keyTracker.TryAdd(key);

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,11 @@ public IEntity GetById(Type type, Guid id)`
`67`	`67`	`{`
`68`	`68`	`//ensure the key doesn't exist anymore in the tracker`
`69`	`69`	`_keyTracker.Remove(key);`
	`70`	`+ return null;`
`70`	`71`	`}`
`71`		`- return result;`
	`72`	`+`
	`73`	`+ //IMPORTANT: we must clone to resolve, see: http://issues.umbraco.org/issue/U4-4259`
	`74`	`+ return (IEntity)result.DeepClone();`
`72`	`75`	`}`
`73`	`76`
`74`	`77`	`public IEnumerable<IEntity> GetByIds(Type type, List<Guid> ids)`
`@@ -88,7 +91,8 @@ public IEnumerable<IEntity> GetByIds(Type type, List<Guid> ids)`
`88`	`91`	`}`
`89`	`92`	`else`
`90`	`93`	`{`
`91`		`- collection.Add(result);`
	`94`	`+ //IMPORTANT: we must clone to resolve, see: http://issues.umbraco.org/issue/U4-4259`
	`95`	`+ collection.Add((IEntity)result.DeepClone());`
`92`	`96`	`}`
`93`	`97`	`}`
`94`	`98`	`return collection;`
`@@ -113,7 +117,8 @@ public IEnumerable<IEntity> GetAllByType(Type type)`
`113`	`117`	`}`
`114`	`118`	`else`
`115`	`119`	`{`
`116`		`- collection.Add(result);`
	`120`	`+ //IMPORTANT: we must clone to resolve, see: http://issues.umbraco.org/issue/U4-4259`
	`121`	`+ collection.Add((IEntity)result.DeepClone());`
`117`	`122`	`}`
`118`	`123`	`}`
`119`	`124`	`}`
`@@ -122,6 +127,9 @@ public IEnumerable<IEntity> GetAllByType(Type type)`
`122`	`127`
`123`	`128`	`public void Save(Type type, IEntity entity)`
`124`	`129`	`{`
	`130`	`+ //IMPORTANT: we must clone to store, see: http://issues.umbraco.org/issue/U4-4259`
	`131`	`+ entity = (IEntity)entity.DeepClone();`
	`132`	`+`
`125`	`133`	`var key = GetCompositeId(type, entity.Id);`
`126`	`134`
`127`	`135`	`_keyTracker.TryAdd(key);`