diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-10-20 15:16:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-20 15:16:01 -0400 |
| commit | 91600b1c81872e1745401942633a87085dc706b5 (patch) | |
| tree | 31a7135ea21ea0912d0dddf21665d22bb5e5345e /Emby.Server.Implementations/Services/ServicePath.cs | |
| parent | fdb0c3a1dff0c1e9c3c22a3be688b97ea0bd7a6d (diff) | |
| parent | 5edb8159a7f8966d09cb222f366d7403a9bf723b (diff) | |
Merge pull request #1898 from Bond-009/jsonfix
Fix Json serialization error
Diffstat (limited to 'Emby.Server.Implementations/Services/ServicePath.cs')
| -rw-r--r-- | Emby.Server.Implementations/Services/ServicePath.cs | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Emby.Server.Implementations/Services/ServicePath.cs b/Emby.Server.Implementations/Services/ServicePath.cs index ccb28e8df..0b67669b9 100644 --- a/Emby.Server.Implementations/Services/ServicePath.cs +++ b/Emby.Server.Implementations/Services/ServicePath.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using System.Reflection; using System.Text; +using System.Text.Json.Serialization; namespace Emby.Server.Implementations.Services { @@ -28,6 +29,13 @@ namespace Emby.Server.Implementations.Services private readonly bool[] isWildcard; private readonly int wildcardCount = 0; + internal static string[] IgnoreAttributesNamed = new[] + { + nameof(JsonIgnoreAttribute) + }; + + private static Type _excludeType = typeof(Stream); + public int VariableArgsCount { get; set; } /// <summary> @@ -190,21 +198,12 @@ namespace Emby.Server.Implementations.Services StringComparer.OrdinalIgnoreCase); } - internal static string[] IgnoreAttributesNamed = new[] - { - "IgnoreDataMemberAttribute", - "JsonIgnoreAttribute" - }; - - - private static Type excludeType = typeof(Stream); - internal static IEnumerable<PropertyInfo> GetSerializableProperties(Type type) { foreach (var prop in GetPublicProperties(type)) { if (prop.GetMethod == null - || excludeType == prop.PropertyType) + || _excludeType == prop.PropertyType) { continue; } |
