Don't eat exceptions from faulted Tasks.
If explicitly testing for IsCompleted then one must also test for IsFaulted and if not handling the exception, return the faulted Task.
This commit is contained in:
@@ -381,21 +381,34 @@ namespace Newtonsoft.Json.Utilities
|
||||
bool[] charEscapeFlags, StringEscapeHandling stringEscapeHandling, JsonTextWriter client, char[] writeBuffer, CancellationToken cancellationToken)
|
||||
{
|
||||
Task task = writer.WriteAsync(delimiter, cancellationToken);
|
||||
if (!task.IsCompleted)
|
||||
switch (task.Status)
|
||||
{
|
||||
return WriteEscapedJavaScriptStringWithDelimitersAsync(task, writer, s, delimiter, charEscapeFlags, stringEscapeHandling, client, writeBuffer, cancellationToken);
|
||||
case TaskStatus.Canceled:
|
||||
case TaskStatus.Faulted:
|
||||
return task;
|
||||
case TaskStatus.RanToCompletion:
|
||||
// Completed synchronously (or very fast!), continue within this rather
|
||||
// that the default branch which uses async
|
||||
break;
|
||||
default:
|
||||
return WriteEscapedJavaScriptStringWithDelimitersAsync(task, writer, s, delimiter, charEscapeFlags, stringEscapeHandling, client, writeBuffer, cancellationToken);
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(s))
|
||||
{
|
||||
task = WriteEscapedJavaScriptStringWithoutDelimitersAsync(writer, s, charEscapeFlags, stringEscapeHandling, client, writeBuffer, cancellationToken);
|
||||
if (!task.IsCompleted)
|
||||
switch (task.Status)
|
||||
{
|
||||
return WriteCharAsync(task, writer, delimiter, cancellationToken);
|
||||
case TaskStatus.Canceled:
|
||||
case TaskStatus.Faulted:
|
||||
return task;
|
||||
case TaskStatus.RanToCompletion:
|
||||
return writer.WriteAsync(delimiter, cancellationToken);
|
||||
}
|
||||
}
|
||||
|
||||
return writer.WriteAsync(delimiter, cancellationToken);
|
||||
return WriteCharAsync(task, writer, delimiter, cancellationToken);
|
||||
|
||||
}
|
||||
|
||||
private static async Task WriteEscapedJavaScriptStringWithDelimitersAsync(Task task, TextWriter writer, string s, char delimiter,
|
||||
|
||||
Reference in New Issue
Block a user