[Nhibernate-commit] SF.net SVN: nhibernate:[4108] trunk/nhibernate/src/NHibernate.ByteCode. Spring

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

Revision: 4108
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4108&view=rev
Author:   fabiomaulo
Date:     2009-03-04 04:39:58 +0000 (Wed, 04 Mar 2009)

Log Message:
-----------
ByteCode provider of Spring.NET: 7 test to full support

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate.ByteCode.Spring/LazyInitializer.cs
    trunk/nhibernate/src/NHibernate.ByteCode.Spring/ProxyFactory.cs

Modified: trunk/nhibernate/src/NHibernate.ByteCode.Spring/LazyInitializer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.ByteCode.Spring/LazyInitializer.cs	2009-03-03 20:02:23 UTC (rev 4107)
+++ trunk/nhibernate/src/NHibernate.ByteCode.Spring/LazyInitializer.cs	2009-03-04 04:39:58 UTC (rev 4108)
@@ -12,8 +12,6 @@
 	[Serializable]
 	public class LazyInitializer : BasicLazyInitializer, IMethodInterceptor, ITargetSource
 	{
-		private static readonly object NULL = new object();
-
 		private static readonly MethodInfo exceptionInternalPreserveStackTrace =
 			typeof (Exception).GetMethod("InternalPreserveStackTrace", BindingFlags.Instance | BindingFlags.NonPublic);
 
@@ -51,7 +49,8 @@
 			object returnValue;
 			try
 			{
-				returnValue = base.Invoke(info.Method, info.Arguments, info.Target);
+				var methodInfo = info.Method;
+				returnValue = base.Invoke(methodInfo, info.Arguments, info.Proxy);
 
 				if (returnValue != InvokeImplementation)
 				{
@@ -59,7 +58,7 @@
 				}
 				if (InterceptCalls)
 				{
-					var method = new SafeMethod(info.Method);
+					var method = new SafeMethod(methodInfo);
 					return method.Invoke(GetImplementation(), info.Arguments);
 				}
 			}
@@ -78,11 +77,7 @@
 
 		object ITargetSource.GetTarget()
 		{
-			if (!IsUninitialized)
-			{
-				return Target;
-			}
-			return NULL;
+			return Target ?? this;
 		}
 
 		void ITargetSource.ReleaseTarget(object target)

Modified: trunk/nhibernate/src/NHibernate.ByteCode.Spring/ProxyFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.ByteCode.Spring/ProxyFactory.cs	2009-03-03 20:02:23 UTC (rev 4107)
+++ trunk/nhibernate/src/NHibernate.ByteCode.Spring/ProxyFactory.cs	2009-03-04 04:39:58 UTC (rev 4108)
@@ -31,10 +31,8 @@
 				var initializer = new LazyInitializer(EntityName, PersistentClass, id, GetIdentifierMethod, SetIdentifierMethod,
 				                                      ComponentIdType, session);
 
-				var proxyFactory = new SerializableProxyFactory();
-				proxyFactory.Interfaces = Interfaces;
-				proxyFactory.TargetSource = initializer;
-				proxyFactory.ProxyTargetType = IsClassProxy;
+				var proxyFactory = new SerializableProxyFactory
+				                   	{Interfaces = Interfaces, TargetSource = initializer, ProxyTargetType = IsClassProxy};
 				proxyFactory.AddAdvice(initializer);
 
 				object proxyInstance = proxyFactory.GetProxy();


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