Fixes #1181 - Provide underlying error at LoadApplicationConfiguratio…

…n() (#1346) * Fixes #1181 - Provide underlying error at LoadApplicationConfiguration()
OPCFoundation · Apr 1, 2021 · d7c7cbc · d7c7cbc
1 parent 25e0998
commit d7c7cbc
Showing 1 changed file with 24 additions and 16 deletions.
diff --git a/Libraries/Opc.Ua.Configuration/ApplicationInstance.cs b/Libraries/Opc.Ua.Configuration/ApplicationInstance.cs
@@ -257,14 +257,20 @@ public void Stop()
             }
             catch (Exception e)
             {
+                Utils.Trace(e, "Could not load configuration file. {0}", filePath);
+
                 // warn user.
-                if (!silent && MessageDlg != null)
+                if (!silent)
                 {
-                    MessageDlg.Message("Load Application Configuration: " + e.Message);
-                    await MessageDlg.ShowAsync().ConfigureAwait(false);
+                    if (MessageDlg != null)
+                    {
+                        MessageDlg.Message("Load Application Configuration: " + e.Message);
+                        await MessageDlg.ShowAsync().ConfigureAwait(false);
+                    }
+
+                    throw e;
                 }
 
-                Utils.Trace(e, "Could not load configuration file. {0}", filePath);
                 return null;
             }
         }
@@ -274,9 +280,21 @@ public void Stop()
         /// </summary>
         public async Task<ApplicationConfiguration> LoadApplicationConfiguration(string filePath, bool silent)
         {
-            ApplicationConfiguration configuration = await LoadAppConfig(
+            ApplicationConfiguration configuration = null;
+
+            try
+            {
+                configuration = await LoadAppConfig(
                 silent, filePath, ApplicationType, ConfigurationType, true, CertificatePasswordProvider)
                 .ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                if (!silent)
+                {
+                    throw e;
+                }
+            }
 
             if (configuration == null)
             {
@@ -294,18 +312,8 @@ public async Task<ApplicationConfiguration> LoadApplicationConfiguration(string
         public async Task<ApplicationConfiguration> LoadApplicationConfiguration(bool silent)
         {
             string filePath = ApplicationConfiguration.GetFilePathFromAppConfig(ConfigSectionName);
-            ApplicationConfiguration configuration = await LoadAppConfig(
-                silent, filePath, ApplicationType, ConfigurationType, true, CertificatePasswordProvider)
-                .ConfigureAwait(false);
-
-            if (configuration == null)
-            {
-                throw ServiceResultException.Create(StatusCodes.BadConfigurationError, "Could not load configuration file.");
-            }
-
-            m_applicationConfiguration = FixupAppConfig(configuration);
 
-            return m_applicationConfiguration;
+            return await LoadApplicationConfiguration(filePath, silent).ConfigureAwait(false);
         }
 
         /// <summary>