Skip to content

Use the OperationCancellationException to replace the StoppingException in 'ConvertToJson' #8920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 2 commits into from
Feb 21, 2019
Merged

Use the OperationCancellationException to replace the StoppingException in 'ConvertToJson' #8920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfc7037
Fix the arguments passed to a string resource
daxian-dbw Aug 15, 2018
de09c6f
[Feature] Use the OperationCancellationException to replace the Stopp…
daxian-dbw Feb 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,6 @@ public DuplicateMemberHashSet(int capacity)
}
}

/// <summary>
/// Exception used for cancellation.
/// </summary>
private class StoppingException : System.Exception
{
}

#endregion HelperTypes

#region ConvertFromJson
Expand Down Expand Up @@ -465,7 +458,7 @@ public static string ConvertToJson(object objectToProcess, in ConvertToJsonConte

return JsonConvert.SerializeObject(preprocessedObject, jsonSettings);
}
catch (StoppingException)
catch (OperationCanceledException)
{
return null;
}
Expand All @@ -482,10 +475,7 @@ public static string ConvertToJson(object objectToProcess, in ConvertToJsonConte
/// <returns>An object suitable for serializing to JSON.</returns>
private static object ProcessValue(object obj, int currentDepth, in ConvertToJsonContext context)
{
if (context.CancellationToken.IsCancellationRequested)
{
throw new StoppingException();
}
context.CancellationToken.ThrowIfCancellationRequested();

PSObject pso = obj as PSObject;

Expand Down
1 change: 1 addition & 0 deletions src/System.Management.Automation/engine/serialization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6714,6 +6714,7 @@ public override object ConvertFrom(PSObject sourceValue, Type destinationType, I
null,
ExtendedTypeSystem.InvalidCastException,
sourceValue,
typeof(PSObject),
destinationType);
}

Expand Down