diff options
| author | Cody Robibero <cody@robibe.ro> | 2021-12-19 11:32:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-19 11:32:00 -0700 |
| commit | e8ae501430afca04a24200c2151a8907be3a0db6 (patch) | |
| tree | 392e74f0fa4f7f09ef2c948696faa89457b0c840 /src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs | |
| parent | db46eaa744c2f198c48c96649efefa2c95a69668 (diff) | |
| parent | ea9fc9f9cc3c269f55768882c631e8022ccb232d (diff) | |
Merge pull request #7018 from Bond-009/json2
Diffstat (limited to 'src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs')
| -rw-r--r-- | src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs b/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs index 51b955145..321cfa502 100644 --- a/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs +++ b/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs @@ -9,7 +9,7 @@ namespace Jellyfin.Extensions.Json.Converters /// Convert delimited string to array of type. /// </summary> /// <typeparam name="T">Type to convert to.</typeparam> - public abstract class JsonDelimitedArrayConverter<T> : JsonConverter<T[]?> + public abstract class JsonDelimitedArrayConverter<T> : JsonConverter<T[]> { private readonly TypeConverter _typeConverter; @@ -31,9 +31,9 @@ namespace Jellyfin.Extensions.Json.Converters { if (reader.TokenType == JsonTokenType.String) { - // GetString can't return null here because we already handled it above - var stringEntries = reader.GetString()?.Split(Delimiter, StringSplitOptions.RemoveEmptyEntries); - if (stringEntries == null || stringEntries.Length == 0) + // null got handled higher up the call stack + var stringEntries = reader.GetString()!.Split(Delimiter, StringSplitOptions.RemoveEmptyEntries); + if (stringEntries.Length == 0) { return Array.Empty<T>(); } |
