From 8637bb92544fb14f37c2d06bbe6cb08d7a3131fe Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 27 Jul 2024 16:59:59 +0000 Subject: [PATCH] Assert ViewStreamDatabase.instance is only created once The instance must be initialized via ViewStreamDatabase.SetGlobalInstance --- .../DataStreamCore/ViewStreamDatabase.cs | 24 +++++++------------ .../DataStreamQueryAnalyzer/MainForm.cs | 2 -- 2 files changed, 8 insertions(+), 18 deletions(-) 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(); diff --git a/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs b/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs index a2de58872..09ff6d239 100644 --- a/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs +++ b/src/DataStreamSuite/DataStreamQueryAnalyzer/MainForm.cs @@ -589,7 +589,6 @@ namespace BCG myLoadAssemblies(); - ViewStreamDatabase.instance = new ViewStreamDatabase(); myAllTagsStream = myGetAllTagsStream(); myAllTagsStream.onChange += myHandleTableListChange; myTabControl.SelectedIndex = 3; @@ -614,7 +613,6 @@ namespace BCG // SitesCore.setMySiteName (mySite); - ViewStreamDatabase.instance = new ViewStreamDatabase(); myAllTagsStream = myGetAllTagsStream(); myAllTagsStream.onChange += myHandleTableListChange;