diff --git a/src/DataStreamSuite/DataStreamCore/ViewStreamDatabase.cs b/src/DataStreamSuite/DataStreamCore/ViewStreamDatabase.cs index 5232d941d..d2ca2c757 100644 --- a/src/DataStreamSuite/DataStreamCore/ViewStreamDatabase.cs +++ b/src/DataStreamSuite/DataStreamCore/ViewStreamDatabase.cs @@ -35,20 +35,10 @@ namespace BCG { public static ViewStreamDatabase instance { get { - if (mySelf == null || mySelf.myIsDisposed) - lock (myInstanceLockObject) { - if (mySelf == null || mySelf.myIsDisposed) { - mySelf = new ViewStreamDatabase(); - } - } - return mySelf; - } - set { - lock (myInstanceLockObject) { - if (mySelf != null) - mySelf.mySubscriberCore.Dispose(); - mySelf = value; - } + var rv = mySelf; + Log.notnull(rv); + Log.assert(!rv.myIsDisposed); + return rv; } } @@ -187,8 +177,10 @@ namespace BCG { } internal static void SetGlobalInstance(ViewStreamDatabase vsd) { - Log.isnull(mySelf); - mySelf = vsd; + lock (myInstanceLockObject) { + Log.isnull(mySelf); + mySelf = vsd; + } } private List _pending_worker_ops = new List();