aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Common/Json
diff options
context:
space:
mode:
authorcrobibero <cody@robibe.ro>2020-11-12 08:06:25 -0700
committercrobibero <cody@robibe.ro>2020-11-12 08:06:25 -0700
commit0c23b8cadf8d4163b0db664a8b2cfb717181eb02 (patch)
tree90e5991362d89017804c4f7c8b83ebe8b26590db /MediaBrowser.Common/Json
parent5669d1dad23153401d1e648faa9b62b1d0e81838 (diff)
Don't throw exception when converting values using binder or JsonConverter
Diffstat (limited to 'MediaBrowser.Common/Json')
-rw-r--r--MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverter.cs27
1 files changed, 24 insertions, 3 deletions
diff --git a/MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverter.cs b/MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverter.cs
index bf7048c370..b24a497613 100644
--- a/MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverter.cs
+++ b/MediaBrowser.Common/Json/Converters/JsonCommaDelimitedArrayConverter.cs
@@ -32,13 +32,34 @@ namespace MediaBrowser.Common.Json.Converters
return Array.Empty<T>();
}
- var entries = new T[stringEntries.Length];
+ var parsedValues = new object[stringEntries.Length];
+ var convertedCount = 0;
for (var i = 0; i < stringEntries.Length; i++)
{
- entries[i] = (T)_typeConverter.ConvertFrom(stringEntries[i].Trim());
+ try
+ {
+ parsedValues[i] = _typeConverter.ConvertFrom(stringEntries[i].Trim());
+ convertedCount++;
+ }
+ catch (FormatException)
+ {
+ // TODO log when upgraded to .Net5
+ // _logger.LogWarning(e, "Error converting value.");
+ }
}
- return entries;
+ var typedValues = new T[convertedCount];
+ var typedValueIndex = 0;
+ for (var i = 0; i < stringEntries.Length; i++)
+ {
+ if (parsedValues[i] != null)
+ {
+ typedValues.SetValue(parsedValues[i], typedValueIndex);
+ typedValueIndex++;
+ }
+ }
+
+ return typedValues;
}
return JsonSerializer.Deserialize<T[]>(ref reader, options);