[Nhibernate-commit] nhibernate/src/NHibernate/Impl SessionImpl.cs,1.56,1.57

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17925/NHibernate/Impl

Modified Files:
	SessionImpl.cs 
Log Message:
Minor mods for proxies.

Index: SessionImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/SessionImpl.cs,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** SessionImpl.cs	9 Dec 2004 22:08:54 -0000	1.56
--- SessionImpl.cs	16 Dec 2004 21:55:24 -0000	1.57
***************
*** 1682,1686 ****
  		public object ProxyFor(IClassPersister persister, Key key, object impl) 
  		{
! 			if ( !persister.HasProxy ) return impl;
  			object proxy = proxiesByKey[key];
  			if (proxy!=null) 
--- 1682,1690 ----
  		public object ProxyFor(IClassPersister persister, Key key, object impl) 
  		{
! 			if ( !persister.HasProxy || key==null ) 
! 			{
! 				return impl;
! 			}
! 
  			object proxy = proxiesByKey[key];
  			if (proxy!=null)