mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #3541 from ericstj/fixAVInterference

Browse source 
Remove File.Copy optimization during expansion
This commit is contained in:
Eric StJohn 2016-06-13 16:57:16 -07:00 • committed by GitHub
commit 8e67d483b7
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Microsoft.DotNet.Archive/IndexedArchive.cs
View file

@ -238,7 +238,7 @@ namespace Microsoft.DotNet.Archive
private class ExtractSource private class ExtractSource
{ {
private string _entryName; private string _entryName;
private string _localPath; private readonly string _localPath;
private ThreadLocalZipArchive _archive; private ThreadLocalZipArchive _archive;
public ExtractSource(string sourceString, Dictionary<string, string> externalFiles, ThreadLocalZipArchive archive) public ExtractSource(string sourceString, Dictionary<string, string> externalFiles, ThreadLocalZipArchive archive)
@ -271,20 +271,9 @@ namespace Microsoft.DotNet.Archive
} }
else else
{ {
// we open the archive each time since ZipArchive is not thread safe and we want to be able
// to extract from many threads
//using (var archive = new ZipArchive(File.Open(_archivePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete)))
using (var sourceStream = _archive.Archive.GetEntry(_entryName).Open()) using (var sourceStream = _archive.Archive.GetEntry(_entryName).Open())
{ {
sourceStream.CopyTo(destinationStream); sourceStream.CopyTo(destinationStream);
var destinationFileStream = destinationStream as FileStream;
if (destinationFileStream != null)
{
// Set Local path so that the next copy operation using the same source will
// do a copy instead of a write.
_localPath = destinationFileStream.Name;
}
} }
} }