From f647c38db5f9ea3ea7f7d2fc0a8d9618bb3e8eb5 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 5 Sep 2017 11:45:18 -0400 Subject: [PATCH] Ibus needs to be unique on tag as well as type. --- src/client/spark/core/bus/IBus.cs | 2 +- src/client/spark/core/bus/SingletonBus.cs | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/client/spark/core/bus/IBus.cs b/src/client/spark/core/bus/IBus.cs index 67c33002d..5983f33f2 100644 --- a/src/client/spark/core/bus/IBus.cs +++ b/src/client/spark/core/bus/IBus.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace bts.api { public interface ITag { } - public interface ISubscribe : IDisposable + public interface ISubscribe { IObservable subscribe(ITag tag); } diff --git a/src/client/spark/core/bus/SingletonBus.cs b/src/client/spark/core/bus/SingletonBus.cs index f259f9c78..47c3a22a2 100644 --- a/src/client/spark/core/bus/SingletonBus.cs +++ b/src/client/spark/core/bus/SingletonBus.cs @@ -13,15 +13,21 @@ namespace bts.core public class SingletonBus : IBus { private class SubjectSingleton { - public static ISubject instance = new Subject(); + public static Dictionary> instance = new Dictionary>(); } private ISubject subject(ITag tag) { - return SubjectSingleton.instance; + var inst = SubjectSingleton.instance; + lock (inst) { + if (inst.TryGetValue(tag, out ISubject result)) { + return result; + } + result = new Subject(); + inst[tag] = result; + return result; + } } - public void Dispose() { } - public void post(ITag tag, T data) { subject(tag).OnNext(data); }