huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #1407 null refs in VCTH tests 

Dictionary isn't thread safe YO.
This commit is contained in:
Ryan Nowak 2017-06-07 12:37:04 -07:00
parent 74fef5f722
commit 45dec0dca4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/Microsoft.AspNetCore.Razor.Test.Common/TestCompilation.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -14,8 +15,8 @@ namespace Microsoft.CodeAnalysis
{ {
public static class TestCompilation public static class TestCompilation
{ {
private static Dictionary<Assembly, IEnumerable<MetadataReference>> _assemblyMetadataReferences = private static readonly ConcurrentDictionary<Assembly, IEnumerable<MetadataReference>> _referenceCache =
new Dictionary<Assembly, IEnumerable<MetadataReference>>(); new ConcurrentDictionary<Assembly, IEnumerable<MetadataReference>>();
public static IEnumerable<MetadataReference> GetMetadataReferences(Assembly assembly) public static IEnumerable<MetadataReference> GetMetadataReferences(Assembly assembly)
{ {
@ -40,10 +41,10 @@ namespace Microsoft.CodeAnalysis
syntaxTrees = new[] { syntaxTree }; syntaxTrees = new[] { syntaxTree };
} }
if (!_assemblyMetadataReferences.TryGetValue(assembly, out IEnumerable<MetadataReference> metadataReferences)) if (!_referenceCache.TryGetValue(assembly, out IEnumerable<MetadataReference> metadataReferences))
{ {
metadataReferences = GetMetadataReferences(assembly); metadataReferences = GetMetadataReferences(assembly);
_assemblyMetadataReferences[assembly] = metadataReferences; _referenceCache.TryAdd(assembly, metadataReferences);
} }
var compilation = CSharpCompilation.Create(AssemblyName, syntaxTrees, metadataReferences); var compilation = CSharpCompilation.Create(AssemblyName, syntaxTrees, metadataReferences);