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

Merge branch 'v8/8.15' into v8/dev

Browse Source
This commit is contained in:
Sebastiaan Janssen
2021-08-06 14:08:20 +02:00
parent 9a16adcb18 61a273c3f5
commit e6cff8c7f5
5 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
/// </summary>
internal class DictionaryOfPropertyDataSerializer : SerializerBase, ISerializer<IDictionary<string, PropertyData[]>>, IDictionaryOfPropertyDataSerializer
{
private static readonly PropertyData[] Empty = Array.Empty<PropertyData>();
public IDictionary<string, PropertyData[]> ReadFrom(Stream stream)
{
// read properties count
@@ -25,6 +26,11 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
// read values count
var vcount = PrimitiveSerializer.Int32.ReadFrom(stream);
if(vcount == 0)
{
dict[key] = Empty;
continue;
}
// create pdata and add to the dictionary
var pdatas = new PropertyData[vcount];

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

@@ -101,6 +101,10 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
{
property.Value = LZ4Pickler.Pickle(Encoding.UTF8.GetBytes((string)property.Value), LZ4Level.L00_FAST);
}
foreach (var property in propertyAliasToData.Value.Where(x => x.Value != null && x.Value is int intVal))
{
property.Value = Convert.ToBoolean((int)property.Value);
}
}
}
}