Merge branch 'master' of https://github.com/unitycontainer/interception…

… into v5.x
unitycontainer · Feb 6, 2019 · 1e0be91 · 1e0be91
2 parents 5a6f11b + 595fc62
commit 1e0be91
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 42 deletions.
diff --git a/.../InstanceInterceptors/InterfaceInterception/InterfaceInterceptorClassGenerator.Desktop.cs b/.../InstanceInterceptors/InterfaceInterception/InterfaceInterceptorClassGenerator.Desktop.cs
diff --git a/...rceptors/InstanceInterceptors/InterfaceInterception/InterfaceInterceptorClassGenerator.cs b/...rceptors/InstanceInterceptors/InterfaceInterception/InterfaceInterceptorClassGenerator.cs
@@ -176,7 +176,7 @@ private void CreateTypeBuilder()
         {
             TypeAttributes newAttributes = TypeAttributes.Public | TypeAttributes.Class;
 
-            ModuleBuilder moduleBuilder = GetModuleBuilder();
+            ModuleBuilder moduleBuilder = InterceptorClassGenerator.CreateModuleBuilder(AssemblyBuilder);
             _typeBuilder = moduleBuilder.DefineType(CreateTypeName(), newAttributes);
 
             _mainInterfaceMapper = DefineGenericArguments();

diff --git a/src/Interceptors/InterceptorClassGenerator.Desktop.cs b/src/Interceptors/InterceptorClassGenerator.Desktop.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Concurrent;
+using System.Reflection.Emit;
+
+namespace Unity.Interception.Interceptors
+{
+    public static class InterceptorClassGenerator
+    {
+        private static readonly ConcurrentDictionary<AssemblyBuilder, ModuleBuilder> ModuleByAssembly =
+            new ConcurrentDictionary<AssemblyBuilder, ModuleBuilder>();
+
+        public static ModuleBuilder CreateModuleBuilder(AssemblyBuilder assemblyBuilder)
+        {
+            return ModuleByAssembly.GetOrAdd(assemblyBuilder, assembly =>
+            {
+                string moduleName = Guid.NewGuid().ToString("N");
+#if DEBUG_SAVE_GENERATED_ASSEMBLY
+            return AssemblyBuilder.DefineDynamicModule(moduleName, moduleName + ".dll", true);
+#else
+                return assembly.DefineDynamicModule(moduleName);
+#endif
+            });
+        }
+    }
+}
diff --git a/...rtualMethodInterception/InterceptingClassGeneration/InterceptingClassGenerator.Desktop.cs b/...rtualMethodInterception/InterceptingClassGeneration/InterceptingClassGenerator.Desktop.cs
diff --git a/...ptors/VirtualMethodInterception/InterceptingClassGeneration/InterceptingClassGenerator.cs b/...ptors/VirtualMethodInterception/InterceptingClassGeneration/InterceptingClassGenerator.cs
@@ -214,7 +214,7 @@ private void CreateTypeBuilder()
 
             Type baseClass = GetGenericType(_typeToIntercept);
 
-            ModuleBuilder moduleBuilder = InterceptingClassGenerator.GetModuleBuilder();
+            ModuleBuilder moduleBuilder = InterceptorClassGenerator.CreateModuleBuilder(AssemblyBuilder);
             _typeBuilder = moduleBuilder.DefineType(
                 "DynamicModule.ns.Wrapped_" + _typeToIntercept.Name + "_" + Guid.NewGuid().ToString("N"),
                 newAttributes,