From 56b7b0df69e473d49dc89cf3f43817560e66d23a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 23 Jun 2021 11:13:19 -0600
Subject: [PATCH] fix build, re-adds braces after merge

---
 ...Tree.DictionaryOfPropertyDataSerializer.cs |  4 +--
 src/Umbraco.Web/PublishedPropertyExtension.cs | 26 +++++++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs
index fa0d853e35..304fc6def0 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs
@@ -13,12 +13,10 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
     {
         public IDictionary<string, PropertyData[]> ReadFrom(Stream stream)
         {
-
             // read properties count
-            var pcount = PrimitiveSerializer.Int32.ReadFrom(stream);
+            var pcount = PrimitiveSerializer.Int32.ReadFrom(stream);            
             var dict = new Dictionary<string, PropertyData[]>(pcount,StringComparer.InvariantCultureIgnoreCase);
 
-            var dict = new Dictionary<string, PropertyData[]>(pcount,StringComparer.InvariantCultureIgnoreCase);
             // read each property
             for (var i = 0; i < pcount; i++)
             {
diff --git a/src/Umbraco.Web/PublishedPropertyExtension.cs b/src/Umbraco.Web/PublishedPropertyExtension.cs
index b431f24828..4f27a429a4 100644
--- a/src/Umbraco.Web/PublishedPropertyExtension.cs
+++ b/src/Umbraco.Web/PublishedPropertyExtension.cs
@@ -36,10 +36,17 @@ namespace Umbraco.Web
             {
                 // we have a value
                 // try to cast or convert it
-                var value =  property.GetValue(culture, segment);
-                if (value is T valueAsT) return valueAsT;
+                var value = property.GetValue(culture, segment);
+                if (value is T valueAsT)
+                {
+                    return valueAsT;
+                }
+
                 var valueConverted = value.TryConvertTo<T>();
-                if (valueConverted) return valueConverted.Result;
+                if (valueConverted)
+                {
+                    return valueConverted.Result;
+                }
 
                 // cannot cast nor convert the value, nothing we can return but 'default'
                 // note: we don't want to fallback in that case - would make little sense
@@ -48,14 +55,23 @@ namespace Umbraco.Web
 
             // we don't have a value, try fallback
             if (PublishedValueFallback.TryGetValue(property, culture, segment, fallback, defaultValue, out var fallbackValue))
+            {
                 return fallbackValue;
+            }
 
             // we don't have a value - neither direct nor fallback
             // give a chance to the converter to return something (eg empty enumerable)
             var noValue = property.GetValue(culture, segment);
-            if (noValue is T noValueAsT) return noValueAsT;
+            if (noValue is T noValueAsT)
+            {
+                return noValueAsT;
+            }
+
             var noValueConverted = noValue.TryConvertTo<T>();
-            if (noValueConverted) return noValueConverted.Result;
+            if (noValueConverted)
+            {
+                return noValueConverted.Result;
+            }
 
             // cannot cast noValue nor convert it, nothing we can return but 'default'
             return default;