aboutsummaryrefslogtreecommitdiff
path: root/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs
diff options
context:
space:
mode:
authorCody Robibero <cody@robibe.ro>2021-12-24 02:01:06 +0000
committerGitHub <noreply@github.com>2021-12-24 02:01:06 +0000
commitcecfdeeec3effa61de2a83b5656059c08536d94e (patch)
treeb77ae70228a2f62d12b258e9467721bdc4bf44fc /src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs
parentfcf5b9b46e7d120904fdafb3df726b1a1309660d (diff)
parent076a13abeb344f7a79d81cce030799c8e77dbfaf (diff)
Merge branch 'master' into unharden-for-lxc
Diffstat (limited to 'src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs')
-rw-r--r--src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs8
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>();
}