Bladeren bron

Fix runtime errors

Bond_009 1 jaar geleden
bovenliggende
commit
8ee1525894
2 gewijzigde bestanden met toevoegingen van 6 en 2 verwijderingen
  1. 3 1
      Emby.Server.Implementations/ApplicationHost.cs
  2. 3 1
      src/Jellyfin.Extensions/Json/JsonDefaults.cs

+ 3 - 1
Emby.Server.Implementations/ApplicationHost.cs

@@ -310,7 +310,9 @@ namespace Emby.Server.Implementations
             {
             {
                 _creatingInstances.Add(type);
                 _creatingInstances.Add(type);
                 Logger.LogDebug("Creating instance of {Type}", type);
                 Logger.LogDebug("Creating instance of {Type}", type);
-                return ActivatorUtilities.CreateInstance(ServiceProvider, type);
+                return ServiceProvider is null
+                    ? Activator.CreateInstance(type)
+                    : ActivatorUtilities.CreateInstance(ServiceProvider, type);
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {

+ 3 - 1
src/Jellyfin.Extensions/Json/JsonDefaults.cs

@@ -1,5 +1,6 @@
 using System.Text.Json;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
 using Jellyfin.Extensions.Json.Converters;
 using Jellyfin.Extensions.Json.Converters;
 
 
 namespace Jellyfin.Extensions.Json
 namespace Jellyfin.Extensions.Json
@@ -41,7 +42,8 @@ namespace Jellyfin.Extensions.Json
                 new JsonNullableStructConverterFactory(),
                 new JsonNullableStructConverterFactory(),
                 new JsonDateTimeConverter(),
                 new JsonDateTimeConverter(),
                 new JsonStringConverter()
                 new JsonStringConverter()
-            }
+            },
+            TypeInfoResolver = new DefaultJsonTypeInfoResolver()
         };
         };
 
 
         private static readonly JsonSerializerOptions _pascalCaseJsonSerializerOptions = new(_jsonSerializerOptions)
         private static readonly JsonSerializerOptions _pascalCaseJsonSerializerOptions = new(_jsonSerializerOptions)