yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/temp8' into temp8-U4-11220

Browse Source 
# Conflicts:
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.cs
This commit is contained in:
Shannon
2018-04-26 19:18:14 +10:00
parent 40f94d23d4 c435597d7e
commit e99c519032
75 changed files with 1361 additions and 841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs
View File

@@ -33,7 +33,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
pdatas.Add(pdata);
// everything that can be null is read/written as object
pdata.LanguageId = ReadIntObject(stream);
pdata.Culture = ReadStringObject(stream);
pdata.Segment = ReadStringObject(stream);
pdata.Value = ReadObject(stream);
}
@@ -61,7 +61,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
foreach (var pdata in values)
{
// everything that can be null is read/written as object
WriteObject(pdata.LanguageId, stream);
WriteObject(pdata.Culture, stream);
WriteObject(pdata.Segment, stream);
WriteObject(pdata.Value, stream);
}