Fix circular reference when serializing/deserializing after registeri…

…ng a singleton JsonSerializerSettings with the Locator (#610) Co-authored-by: Josh Plooster <josh.plooster@polaris.com>
reactiveui · Oct 16, 2020 · 113ed07 · 113ed07
1 parent 7809f40
commit 113ed07
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 16 deletions.
diff --git a/src/Akavache.Core/BlobCache/InMemoryBlobCache.cs b/src/Akavache.Core/BlobCache/InMemoryBlobCache.cs
@@ -451,10 +451,7 @@ protected virtual void Dispose(bool isDisposing)
 
         private byte[] SerializeObject<T>(T value)
         {
-            var settings = Locator.Current.GetService<JsonSerializerSettings>() ?? new JsonSerializerSettings();
-            _jsonDateTimeContractResolver.ExistingContractResolver = settings.ContractResolver;
-            settings.ContractResolver = _jsonDateTimeContractResolver;
-            var serializer = JsonSerializer.Create(settings);
+            var serializer = GetSerializer();
             using (var ms = new MemoryStream())
             {
                 using (var writer = new BsonDataWriter(ms))
@@ -467,10 +464,7 @@ private byte[] SerializeObject<T>(T value)
 
         private T DeserializeObject<T>(byte[] data)
         {
-            var settings = Locator.Current.GetService<JsonSerializerSettings>() ?? new JsonSerializerSettings();
-            _jsonDateTimeContractResolver.ExistingContractResolver = settings.ContractResolver;
-            settings.ContractResolver = _jsonDateTimeContractResolver;
-            var serializer = JsonSerializer.Create(settings);
+            var serializer = GetSerializer();
             using (var reader = new BsonDataReader(new MemoryStream(data)))
             {
                 var forcedDateTimeKind = BlobCache.ForcedDateTimeKind;
@@ -492,5 +486,21 @@ private T DeserializeObject<T>(byte[] data)
                 return serializer.Deserialize<T>(reader);
             }
         }
+
+        private JsonSerializer GetSerializer()
+        {
+            var settings = Locator.Current.GetService<JsonSerializerSettings>() ?? new JsonSerializerSettings();
+            JsonSerializer serializer;
+
+            lock (settings)
+            {
+                _jsonDateTimeContractResolver.ExistingContractResolver = settings.ContractResolver;
+                settings.ContractResolver = _jsonDateTimeContractResolver;
+                serializer = JsonSerializer.Create(settings);
+                settings.ContractResolver = _jsonDateTimeContractResolver.ExistingContractResolver;
+            }
+
+            return serializer;
+        }
     }
 }
diff --git a/src/Akavache.Sqlite3/SqlLiteCache/SqlRawPersistentBlobCache.cs b/src/Akavache.Sqlite3/SqlLiteCache/SqlRawPersistentBlobCache.cs
@@ -681,10 +681,7 @@ protected virtual IObservable<byte[]> AfterReadFromDiskFilter(byte[] data, ISche
 
         private byte[] SerializeObject<T>(T value)
         {
-            var settings = Locator.Current.GetService<JsonSerializerSettings>() ?? new JsonSerializerSettings();
-            _jsonDateTimeContractResolver.ExistingContractResolver = settings.ContractResolver;
-            settings.ContractResolver = _jsonDateTimeContractResolver;
-            var serializer = JsonSerializer.Create(settings);
+            var serializer = GetSerializer();
             using (var ms = new MemoryStream())
             {
                 using (var writer = new BsonDataWriter(ms))
@@ -697,10 +694,7 @@ private byte[] SerializeObject<T>(T value)
 
         private IObservable<T> DeserializeObject<T>(byte[] data)
         {
-            var settings = Locator.Current.GetService<JsonSerializerSettings>() ?? new JsonSerializerSettings();
-            _jsonDateTimeContractResolver.ExistingContractResolver = settings.ContractResolver;
-            settings.ContractResolver = _jsonDateTimeContractResolver;
-            var serializer = JsonSerializer.Create(settings);
+            var serializer = GetSerializer();
             using (var reader = new BsonDataReader(new MemoryStream(data)))
             {
                 var forcedDateTimeKind = BlobCache.ForcedDateTimeKind;
@@ -731,5 +725,21 @@ private IObservable<T> DeserializeObject<T>(byte[] data)
                 }
             }
         }
+
+        private JsonSerializer GetSerializer()
+        {
+            var settings = Locator.Current.GetService<JsonSerializerSettings>() ?? new JsonSerializerSettings();
+            JsonSerializer serializer;
+
+            lock (settings)
+            {
+                _jsonDateTimeContractResolver.ExistingContractResolver = settings.ContractResolver;
+                settings.ContractResolver = _jsonDateTimeContractResolver;
+                serializer = JsonSerializer.Create(settings);
+                settings.ContractResolver = _jsonDateTimeContractResolver.ExistingContractResolver;
+            }
+
+            return serializer;
+        }
     }
 }