Skip to content

Commit

Permalink
Merge pull request #1324 from dotnet/dev/bartde/slightly_better_excep…
Browse files Browse the repository at this point in the history 
…tions

Non-empty stack traces for operator exceptions.
  • Loading branch information
@bartdesmet
bartdesmet committed Sep 30, 2020
2 parents e98b11a + 1bb1fcf commit b2d4902
Show file tree
Hide file tree
Showing 12 changed files with 304 additions and 31 deletions.
9 changes: 8 additions & 1 deletion Rx.NET/Source/src/System.Reactive/Linq/Observable/Aggregate.cs
View file
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
View file
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
9 changes: 8 additions & 1 deletion Rx.NET/Source/src/System.Reactive/Linq/Observable/ElementAt.cs
View file
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
View file
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
View file
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
View file
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
View file
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

0 comments on commit b2d4902

Please sign in to comment.