Skip to content
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.

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

Non-empty stack traces for operator exceptions. #1324

Merged
merged 1 commit into from
Sep 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,14 @@ public override void OnCompleted()
{
if (!_hasAccumulation)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
else
{
Expand Down
45 changes: 40 additions & 5 deletions Rx.NET/Source/src/System.Reactive/Linq/Observable/Average.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,14 @@ public override void OnCompleted()
}
else
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
}
}
Expand Down Expand Up @@ -110,7 +117,14 @@ public override void OnCompleted()
}
else
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
}
}
Expand Down Expand Up @@ -166,7 +180,14 @@ public override void OnCompleted()
}
else
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
}
}
Expand Down Expand Up @@ -222,7 +243,14 @@ public override void OnCompleted()
}
else
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
}
}
Expand Down Expand Up @@ -278,7 +306,14 @@ public override void OnCompleted()
}
else
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,14 @@ public override void OnCompleted()
{
if (_i >= 0)
{
ForwardOnError(new ArgumentOutOfRangeException("index"));
try
{
throw new ArgumentOutOfRangeException("index");
}
catch (Exception e)
{
ForwardOnError(e);
}
}
}
}
Expand Down
18 changes: 16 additions & 2 deletions Rx.NET/Source/src/System.Reactive/Linq/Observable/FirstAsync.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,14 @@ public override void OnCompleted()
{
if (!_found)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
}
}
Expand Down Expand Up @@ -97,7 +104,14 @@ public override void OnCompleted()
{
if (!_found)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_MATCHING_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_MATCHING_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
}
}
Expand Down
18 changes: 16 additions & 2 deletions Rx.NET/Source/src/System.Reactive/Linq/Observable/LastAsync.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,14 @@ public override void OnCompleted()
{
if (!_seenValue)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
else
{
Expand Down Expand Up @@ -118,7 +125,14 @@ public override void OnCompleted()
{
if (!_seenValue)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_MATCHING_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_MATCHING_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
else
{
Expand Down
54 changes: 48 additions & 6 deletions Rx.NET/Source/src/System.Reactive/Linq/Observable/Max.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,14 @@ public override void OnCompleted()
{
if (!_hasValue)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
else
{
Expand Down Expand Up @@ -177,7 +184,14 @@ public override void OnCompleted()
{
if (!_hasValue)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
else
{
Expand Down Expand Up @@ -231,7 +245,14 @@ public override void OnCompleted()
{
if (!_hasValue)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
else
{
Expand Down Expand Up @@ -285,7 +306,14 @@ public override void OnCompleted()
{
if (!_hasValue)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
else
{
Expand Down Expand Up @@ -339,7 +367,14 @@ public override void OnCompleted()
{
if (!_hasValue)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
else
{
Expand Down Expand Up @@ -393,7 +428,14 @@ public override void OnCompleted()
{
if (!_hasValue)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
else
{
Expand Down
54 changes: 48 additions & 6 deletions Rx.NET/Source/src/System.Reactive/Linq/Observable/Min.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,14 @@ public override void OnCompleted()
{
if (!_hasValue)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
else
{
Expand Down Expand Up @@ -177,7 +184,14 @@ public override void OnCompleted()
{
if (!_hasValue)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
else
{
Expand Down Expand Up @@ -231,7 +245,14 @@ public override void OnCompleted()
{
if (!_hasValue)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
else
{
Expand Down Expand Up @@ -285,7 +306,14 @@ public override void OnCompleted()
{
if (!_hasValue)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
else
{
Expand Down Expand Up @@ -339,7 +367,14 @@ public override void OnCompleted()
{
if (!_hasValue)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
else
{
Expand Down Expand Up @@ -393,7 +428,14 @@ public override void OnCompleted()
{
if (!_hasValue)
{
ForwardOnError(new InvalidOperationException(Strings_Linq.NO_ELEMENTS));
try
{
throw new InvalidOperationException(Strings_Linq.NO_ELEMENTS);
}
catch (Exception e)
{
ForwardOnError(e);
}
}
else
{
Expand Down
Loading