Resolved #635 - Use the ConcurrentDictionary for constructor invoker …

…caching in DNX451 and DNXCORE50.
autofac · Apr 14, 2015 · 3c6309a · 3c6309a
1 parent c7e1bb8
commit 3c6309a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Autofac/Core/Activators/Reflection/ConstructorParameterBinding.cs b/src/Autofac/Core/Activators/Reflection/ConstructorParameterBinding.cs
@@ -24,6 +24,9 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 
 using System;
+#if DNX451 || DNXCORE50
+using System.Collections.Concurrent;
+#endif
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq.Expressions;
@@ -39,7 +42,11 @@ public class ConstructorParameterBinding
     {
         readonly ConstructorInfo _ci;
         readonly Func<object>[] _valueRetrievers;
+#if DNX451 || DNXCORE50
+        readonly static ConcurrentDictionary<ConstructorInfo, Func<object[], object>> _constructorInvokers = new ConcurrentDictionary<ConstructorInfo, Func<object[], object>>();
+#else
         readonly static SafeDictionary<ConstructorInfo, Func<object[], object>> _constructorInvokers = new SafeDictionary<ConstructorInfo, Func<object[], object>>();
+#endif
 
         // We really need to report all non-bindable parameters, howevers some refactoring
         // will be necessary before this is possible. Adding this now to ease the

diff --git a/src/Autofac/project.json b/src/Autofac/project.json
@@ -19,7 +19,8 @@
 		"dnx451": { },
 		"dnxcore50": {
 			"dependencies": {
-				"System.Collections": "4.0.10-beta-*",
+                "System.Collections": "4.0.10-beta-*",
+                "System.Collections.Concurrent": "4.0.10-beta-*",
 				"System.ComponentModel": "4.0.0-beta-*",
 				"System.Diagnostics.Contracts": "4.0.0-beta-*",
 				"System.Diagnostics.Debug": "4.0.10-beta-*",