Fix XSLT file streams not being closed properly under new parallelisa…

…tion
RedpointArchive · Jan 19, 2017 · 20b46ef · 20b46ef
1 parent 6a1ced7
commit 20b46ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Protobuild.Internal/BuildResources/ResourceProvider.cs b/Protobuild.Internal/BuildResources/ResourceProvider.cs
@@ -151,7 +151,7 @@ private Stream LoadOverriddableResource(ResourceType resourceType, Language lang
                     if (File.Exists(path))
                     {
                         loadHash = "path:" + path;
-                        source = File.Open(path, FileMode.Open);
+                        source = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read);
                         break;
                     }
                 }
@@ -272,6 +272,7 @@ public XslCompiledTransform LoadXSLT(ResourceType resourceType, Language languag
 
             var resolver = new EmbeddedResourceResolver();
             var result = new XslCompiledTransform();
+            using (source)
             using (var reader = XmlReader.Create(source))
             {
                 try
@@ -318,12 +319,13 @@ public XslCompiledTransform LoadXSLT(ResourceType resourceType, Language languag
         public XmlDocument LoadXML(ResourceType resourceType, Language language, string platform)
         {
             string loadHash;
-            var source = this.LoadOverriddableResource(resourceType, language, platform, out loadHash);
-
-            var document = new XmlDocument();
-            document.Load(source);
+            using (var source = this.LoadOverriddableResource(resourceType, language, platform, out loadHash))
+            {
+                var document = new XmlDocument();
+                document.Load(source);
 
-            return document;
+                return document;
+            }
         }
 
         private Stream GetTransparentDecompressionStream(Stream input)

diff --git a/Protobuild.exe b/Protobuild.exe
diff --git a/Protobuild/Protobuild.Internal.dll.lzma b/Protobuild/Protobuild.Internal.dll.lzma