Reduce usage of NHibernate.Proxy.DynamicProxy.IProxy

Author: hazzik

src/NHibernate/Proxy/DynamicProxy/DefaultMethodEmitter.cs

@@ -10,15 +10,12 @@
 using System.Diagnostics;
 using System.Reflection;
 using System.Reflection.Emit;
-using NHibernate.Linq;
 using NHibernate.Util;
 
 namespace NHibernate.Proxy.DynamicProxy
 {
 	internal class DefaultMethodEmitter : IMethodBodyEmitter
 	{
-		private static readonly MethodInfo getInterceptor;
-
 		private static readonly MethodInfo handlerMethod = ReflectHelper.GetMethod<IInterceptor>(
 			i => i.Intercept(null));
 		private static readonly MethodInfo getArguments = typeof(InvocationInfo).GetMethod("get_Arguments");
@@ -33,15 +30,12 @@ internal class DefaultMethodEmitter : IMethodBodyEmitter
 				typeof (object[])
 			});
 
-		private static readonly PropertyInfo interceptorProperty = typeof (IProxy).GetProperty("Interceptor");
-
 		private static readonly ConstructorInfo notImplementedConstructor = typeof(NotImplementedException).GetConstructor(new System.Type[0]);
 
 		private readonly IArgumentHandler _argumentHandler;
 
 		static DefaultMethodEmitter()
 		{
-			getInterceptor = interceptorProperty.GetGetMethod();
 		}
 
 		public DefaultMethodEmitter() : this(new DefaultArgumentHandler()) {}
@@ -60,12 +54,12 @@ public void EmitMethodBody(MethodBuilder proxyMethod, MethodBuilder callbackMeth
 			ParameterInfo[] parameters = method.GetParameters();
 			IL.DeclareLocal(typeof (object[]));
 			IL.DeclareLocal(typeof (InvocationInfo));
-			IL.DeclareLocal(typeof(System.Type[]));
+			IL.DeclareLocal(typeof (System.Type[]));
 
 			IL.Emit(OpCodes.Ldarg_0);
-			IL.Emit(OpCodes.Callvirt, getInterceptor);
+			IL.Emit(OpCodes.Ldfld, field);
 
-			// if (interceptor == null)
+			// if (this.interceptor == null)
 			// 		return base.method(...);
 
 			Label skipBaseCall = IL.DefineLabel();
@@ -90,9 +84,9 @@ public void EmitMethodBody(MethodBuilder proxyMethod, MethodBuilder callbackMeth
 			IL.Emit(OpCodes.Newobj, infoConstructor);
 			IL.Emit(OpCodes.Stloc_1);
 
-			// this.Interceptor.Intercept(info);
+			// this.interceptor.Intercept(info);
 			IL.Emit(OpCodes.Ldarg_0);
-			IL.Emit(OpCodes.Callvirt, getInterceptor);
+			IL.Emit(OpCodes.Ldfld, field);
 			IL.Emit(OpCodes.Ldloc_1);
 			IL.Emit(OpCodes.Callvirt, handlerMethod);
 

src/NHibernate/Proxy/DynamicProxy/ProxyObjectReference.cs

@@ -16,14 +16,13 @@ namespace NHibernate.Proxy.DynamicProxy
 	[Serializable]
 	public class ProxyObjectReference : IObjectReference, ISerializable
 	{
-		private readonly System.Type _baseType;
-		private readonly IProxy _proxy;
+		private readonly object _proxy;
 
 		protected ProxyObjectReference(SerializationInfo info, StreamingContext context)
 		{
 			// Deserialize the base type using its assembly qualified name
 			string qualifiedName = info.GetString("__baseType");
-			_baseType = System.Type.GetType(qualifiedName, true, false);
+			var baseType = System.Type.GetType(qualifiedName, true, false);
 
 			// Rebuild the list of interfaces
 			var interfaceList = new List<System.Type>();
@@ -39,11 +38,11 @@ protected ProxyObjectReference(SerializationInfo info, StreamingContext context)
 
 			// Reconstruct the proxy
 			var factory = new ProxyFactory();
-			System.Type proxyType = factory.CreateProxyType(_baseType, interfaceList.ToArray());
+			System.Type proxyType = factory.CreateProxyType(baseType, interfaceList.ToArray());
 
 			// Initialize the proxy with the deserialized data
 			var args = new object[] {info, context};
-			_proxy = (IProxy) Activator.CreateInstance(proxyType, args);
+			_proxy = Activator.CreateInstance(proxyType, args);
 		}
 
 		#region IObjectReference Members