Rework dispose of ServerInternalData

Author: wbtoms

Libraries/Opc.Ua.Server/Server/ServerInternalData.cs

@@ -30,9 +30,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Security.Cryptography.X509Certificates;
 using Opc.Ua.Configuration;
-using Opc.Ua.Security.Certificates;
 
 #pragma warning disable 0618
 
@@ -88,13 +86,22 @@ protected virtual void Dispose(bool disposing)
         {
             if (disposing)
             {
+                Initialized = false;
+
                 Utils.SilentDispose(m_resourceManager);
                 Utils.SilentDispose(m_requestManager);
                 Utils.SilentDispose(m_aggregateManager);
                 Utils.SilentDispose(m_nodeManager);
                 Utils.SilentDispose(m_sessionManager);
                 Utils.SilentDispose(m_subscriptionManager);
                 Utils.SilentDispose(m_monitoredItemQueueFactory);
+
+                m_endpointAddresses?.Clear();
+                m_endpointAddresses = null;
+                m_typeTree?.Clear();
+                m_typeTree = null;
+                m_serverUris = null;
+                m_defaultSystemContext = null;
             }
         }
         #endregion

Libraries/Opc.Ua.Server/Server/StandardServer.cs

@@ -56,9 +56,9 @@ public StandardServer(
             IServerInternal serverInternal,
             IMainNodeManagerFactory mainNodeManagerFactory)
         {
-            m_applicationInstance = applicationInstance;
-            m_serverInternal = serverInternal;
-            m_mainNodeManagerFactory = mainNodeManagerFactory;
+            m_applicationInstance = applicationInstance ?? throw new ArgumentNullException(nameof(applicationInstance));
+            m_serverInternal = serverInternal ?? throw new ArgumentNullException(nameof(serverInternal));
+            m_mainNodeManagerFactory = mainNodeManagerFactory ?? throw new ArgumentNullException(nameof(mainNodeManagerFactory)); ;
         }
         #endregion
 
@@ -88,12 +88,7 @@ protected override void Dispose(bool disposing)
                     m_configurationWatcher = null;
                 }
 
-                // close the server.
-                //if (m_serverInternal != null)
-                //{
-                //    Utils.SilentDispose(m_serverInternal);
-                //    m_serverInternal = null;
-                //}
+                Utils.SilentDispose(m_serverInternal);
             }
 
             base.Dispose(disposing);
@@ -3203,12 +3198,7 @@ protected override void OnServerStopping()
             }
             finally
             {
-                // ensure that everything is cleaned up.
-                //if (m_serverInternal != null)
-                //{
-                //    Utils.SilentDispose(m_serverInternal);
-                //    m_serverInternal = null;
-                //}
+                Utils.SilentDispose(m_serverInternal);
             }
         }