[Nhibernate-commit] SF.net SVN: nhibernate:[5571] trunk/nhibernate/src/NHibernate/Proxy/ DynamicProxy/ProxyFactory.cs

[<fab...@us...>]

Revision: 5571
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5571&view=rev
Author:   fabiomaulo
Date:     2011-03-30 22:41:47 +0000 (Wed, 30 Mar 2011)

Log Message:
-----------
Fix NH-2607 even if cannot be recreated using the obj as mapped entity (the DynProxyTypeValidator already prevent the case exposed).

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Proxy/DynamicProxy/ProxyFactory.cs

Modified: trunk/nhibernate/src/NHibernate/Proxy/DynamicProxy/ProxyFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Proxy/DynamicProxy/ProxyFactory.cs	2011-03-30 22:25:25 UTC (rev 5570)
+++ trunk/nhibernate/src/NHibernate/Proxy/DynamicProxy/ProxyFactory.cs	2011-03-30 22:41:47 UTC (rev 5571)
@@ -179,10 +179,12 @@
 
 		private bool IsProxiable(MethodInfo method)
 		{
-			return (((method.IsPublic || method.IsFamily || method.IsAssembly || method.IsFamilyOrAssembly)
-			         && (method.IsVirtual || method.IsAbstract))
-			        && (method.DeclaringType != typeof(MarshalByRefObject)))
-			       && (method.DeclaringType != typeof(object) || !"finalize".Equals(method.Name.ToLowerInvariant()));
+			return (
+				((method.IsPublic || method.IsFamily || method.IsAssembly || method.IsFamilyOrAssembly) && (method.IsVirtual || method.IsAbstract))
+				&& !method.IsFinal
+			  && (method.DeclaringType != typeof (MarshalByRefObject)))
+			  && (method.DeclaringType != typeof (object) || !"finalize".Equals(method.Name.ToLowerInvariant())
+				);
 		}
 
 		private static ConstructorBuilder DefineConstructor(TypeBuilder typeBuilder)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.