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

Avoid throwing on ResourceSubject dispose if source sequence terminated exceptionally #1293

Merged
merged 2 commits into from
Mar 18, 2023
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
45 changes: 45 additions & 0 deletions Bonsai.Core.Tests/SubjectTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
using System;
using System.Reactive.Linq;
using Bonsai.Expressions;
using Bonsai.Reactive;
using Microsoft.VisualStudio.TestTools.UnitTesting;

namespace Bonsai.Core.Tests
{
[TestClass]
public class SubjectTests
{
[TestMethod]
public void ResourceSubject_SourceTerminatesExceptionally_ShouldNotTryToDispose()
{
var workflowBuilder = new WorkflowBuilder();
var source = workflowBuilder.Workflow.Add(new CombinatorBuilder { Combinator = new ThrowSource() });
var subject = workflowBuilder.Workflow.Add(new ResourceSubject { Name = nameof(ResourceSubject) });
var sink = workflowBuilder.Workflow.Add(new CombinatorBuilder { Combinator = new CatchSink() });
workflowBuilder.Workflow.AddEdge(source, subject, new ExpressionBuilderArgument());
workflowBuilder.Workflow.AddEdge(subject, sink, new ExpressionBuilderArgument());
var observable = workflowBuilder.Workflow.BuildObservable();
observable.FirstOrDefaultAsync().Wait();
}

class ThrowSource : Source<IDisposable>
{
public override IObservable<IDisposable> Generate()
{
return Observable.Throw<IDisposable>(new SubjectException());
}
}

class CatchSink : Sink
{
public override IObservable<TSource> Process<TSource>(IObservable<TSource> source)
{
return source.Catch<TSource>(Observable.Empty<TSource>());
}
}

class SubjectException : Exception
{
}
}
}
10 changes: 7 additions & 3 deletions Bonsai.Core/Reactive/Subjects/ResourceSubject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,15 @@ public void Dispose()
{
if (subject.IsCompleted)
{
var disposable = subject.GetResult();
if (disposable != null)
try
{
disposable.Dispose();
var disposable = subject.GetResult();
if (disposable != null)
{
disposable.Dispose();
}
}
catch { /* source terminated exceptionally */ }
}

subject.Dispose();
Expand Down