Merge pull request #145 from K47S/master

Fix: Multiple servers cannot add their certs to the DiscoveryServer t…
OPCFoundation · Sep 28, 2017 · 2597151 · 2597151
2 parents aa23ea5 + 2a9529b
commit 2597151
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/Stack/Core/Stack/Configuration/SecurityConfigurationManager.cs b/Stack/Core/Stack/Configuration/SecurityConfigurationManager.cs
@@ -80,7 +80,7 @@ public SecuredApplication ReadConfiguration(string filePath)
                         "Cannot find the configuration file for the executable: {0}",
                         filePath);
                 }
-                
+
                 if (!File.Exists(configFilePath))
                 {
                     throw ServiceResultException.Create(
@@ -92,10 +92,10 @@ public SecuredApplication ReadConfiguration(string filePath)
 
             SecuredApplication application = null;
             ApplicationConfiguration applicationConfiguration = null;
-            
+
             try
             {
-                XmlTextReader reader = new XmlTextReader(File.Open(configFilePath, FileMode.Open, FileAccess.Read));
+                XmlTextReader reader = new XmlTextReader(File.Open(configFilePath, FileMode.Open, FileAccess.Read, FileShare.Read));
 
                 try
                 {
@@ -115,7 +115,7 @@ public SecuredApplication ReadConfiguration(string filePath)
                     else
                     {
                         reader.Close();
-                        reader = new XmlTextReader(File.Open(configFilePath, FileMode.Open, FileAccess.Read));
+                        reader = new XmlTextReader(File.Open(configFilePath, FileMode.Open, FileAccess.Read, FileShare.Read));
                         DataContractSerializer serializer = new DataContractSerializer(typeof(ApplicationConfiguration));
                         applicationConfiguration = serializer.ReadObject(reader, false) as ApplicationConfiguration;
                     }
@@ -139,7 +139,7 @@ public SecuredApplication ReadConfiguration(string filePath)
             {
                 return application;
             }
-            
+
             application = new SecuredApplication();
 
             // copy application info.
@@ -156,7 +156,7 @@ public SecuredApplication ReadConfiguration(string filePath)
             if (applicationConfiguration.SecurityConfiguration != null)
             {
                 application.ApplicationCertificate = SecuredApplication.ToCertificateIdentifier(applicationConfiguration.SecurityConfiguration.ApplicationCertificate);
-                
+
                 if (applicationConfiguration.SecurityConfiguration.TrustedIssuerCertificates != null)
                 {
                     application.IssuerCertificateStore = SecuredApplication.ToCertificateStoreIdentifier(applicationConfiguration.SecurityConfiguration.TrustedIssuerCertificates);
@@ -262,7 +262,7 @@ public void WriteConfiguration(string filePath, SecuredApplication configuration
                 configuration.LastExportTime = DateTime.UtcNow;
                 element.InnerXml = SetObject(typeof(SecuredApplication), configuration);
             }
-            
+
             // update application configuration.
             else
             {